解决代码冲突

package.json

@@ -125,11 +125,7 @@
   "scripts": {
     "start": "node --max_old_space_size=15360 scripts/start.js",
     "build": "cross-env NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
-<<<<<<< HEAD
     "test-build": "cross-env NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
-=======
-    "test-build": "NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
->>>>>>> 9be808e37f9c52698b7861d74cd537e356aafb6d
     "pre-build": "NODE_ENV=preBuild node --max_old_space_size=15360 scripts/build.js",
     "gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json",
     "ana": "webpack-bundle-analyzer ./stats.json",

public/css/iconfont.css

@@ -1,14 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-<<<<<<< HEAD
+  src: url('iconfont.woff2?t=1632964996877') format('woff2'),
-  src: url('iconfont.woff2?t=1632881251448') format('woff2'),
+       url('iconfont.woff?t=1632964996877') format('woff'),
-       url('iconfont.woff?t=1632881251448') format('woff'),
+       url('iconfont.ttf?t=1632964996877') format('truetype');
-       url('iconfont.ttf?t=1632881251448') format('truetype');
-=======
-  src: url('iconfont.woff2?t=1631773579834') format('woff2'),
-       url('iconfont.woff?t=1631773579834') format('woff'),
-       url('iconfont.ttf?t=1631773579834') format('truetype');
->>>>>>> 9be808e37f9c52698b7861d74cd537e356aafb6d
 }
 
 .iconfont {
@@ -19,7 +13,6 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-<<<<<<< HEAD
 .icon-wenjian7:before {
   content: "\e8e0";
 }
@@ -44,8 +37,6 @@
   content: "\e8db";
 }
 
-=======
->>>>>>> 9be808e37f9c52698b7861d74cd537e356aafb6d
 .icon-xiangmubiaoqian:before {
   content: "\e8da";
 }

public/css/iconfont.json

@@ -6,7 +6,6 @@
   "description": "",
   "glyphs": [
     {
-<<<<<<< HEAD
       "icon_id": "24656750",
       "name": "文件",
       "font_class": "wenjian7",
@@ -49,8 +48,6 @@
       "unicode_decimal": 59611
     },
     {
-=======
->>>>>>> 9be808e37f9c52698b7861d74cd537e356aafb6d
       "icon_id": "24378423",
       "name": "项目标签",
       "font_class": "xiangmubiaoqian",

src/forge/Component/Releases.jsx

@@ -27,11 +27,7 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
           })
         :
         <div className="mt8">
-<<<<<<< HEAD
           您暂未发布任何版本{baseOperate && projectType !==2 && <Link className="color-blue ml20" to={{pathname:`/${owner}/${projectsId}/releases/new`,state:{stable:true}}}>创建新版本</Link>}
-=======
-          您暂未发布任何版本{baseOperate && projectType !==2 && <Link className="color-blue ml20" to={`/${owner}/${projectsId}/releases/new`}>创建新版本</Link>}
->>>>>>> 9be808e37f9c52698b7861d74cd537e356aafb6d
         </div>
       }