diff --git a/package.json b/package.json
index af6d0f20..04142cb4 100644
--- a/package.json
+++ b/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",
diff --git a/public/css/iconfont.css b/public/css/iconfont.css
index 781e9c2c..3866189c 100644
--- a/public/css/iconfont.css
+++ b/public/css/iconfont.css
@@ -1,14 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 2340181 */
-<<<<<<< HEAD
- src: url('iconfont.woff2?t=1632881251448') format('woff2'),
- url('iconfont.woff?t=1632881251448') format('woff'),
- 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
+ src: url('iconfont.woff2?t=1632964996877') format('woff2'),
+ url('iconfont.woff?t=1632964996877') format('woff'),
+ url('iconfont.ttf?t=1632964996877') format('truetype');
}
.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";
}
diff --git a/public/css/iconfont.js b/public/css/iconfont.js
index 514e511b..0e23ffb8 100644
--- a/public/css/iconfont.js
+++ b/public/css/iconfont.js
@@ -1,5 +1 @@
-<<<<<<< HEAD
-!function(c){var a,l,h,i,o,z='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),p=function(c,a){a.parentNode.insertBefore(c,a)};if(t&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function v(){o||(o=!0,h())}function m(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(m,50)}v()}a=function(){var c,a;(a=document.createElement("div")).innerHTML=z,z=null,(c=a.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",a=c,(c=document.body).firstChild?p(a,c.firstChild):c.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),a()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(h=a,i=c.document,o=!1,m(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,v())})}(window);
-=======
-!function(c){var a,l,h,i,o,z='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),p=function(c,a){a.parentNode.insertBefore(c,a)};if(t&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function v(){o||(o=!0,h())}function m(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(m,50)}v()}a=function(){var c,a;(a=document.createElement("div")).innerHTML=z,z=null,(c=a.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",a=c,(c=document.body).firstChild?p(a,c.firstChild):c.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),a()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(h=a,i=c.document,o=!1,m(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,v())})}(window);
->>>>>>> 9be808e37f9c52698b7861d74cd537e356aafb6d
+!function(c){var a,l,h,i,o,z='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),p=function(c,a){a.parentNode.insertBefore(c,a)};if(t&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function v(){o||(o=!0,h())}function m(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(m,50)}v()}a=function(){var c,a;(a=document.createElement("div")).innerHTML=z,z=null,(c=a.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",a=c,(c=document.body).firstChild?p(a,c.firstChild):c.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),a()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(h=a,i=c.document,o=!1,m(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,v())})}(window);
\ No newline at end of file
diff --git a/public/css/iconfont.json b/public/css/iconfont.json
index 6eb599b6..5acfb6e9 100644
--- a/public/css/iconfont.json
+++ b/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",
diff --git a/public/css/iconfont.ttf b/public/css/iconfont.ttf
index 3259828f..cffaad68 100644
Binary files a/public/css/iconfont.ttf and b/public/css/iconfont.ttf differ
diff --git a/public/css/iconfont.woff b/public/css/iconfont.woff
index dda1c163..af2a764e 100644
Binary files a/public/css/iconfont.woff and b/public/css/iconfont.woff differ
diff --git a/public/css/iconfont.woff2 b/public/css/iconfont.woff2
index c0cd23a4..7d4cb19b 100644
Binary files a/public/css/iconfont.woff2 and b/public/css/iconfont.woff2 differ
diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx
index d5cf154a..7a287d96 100644
--- a/src/forge/Component/Releases.jsx
+++ b/src/forge/Component/Releases.jsx
@@ -27,11 +27,7 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
})
:
-<<<<<<< HEAD
您暂未发布任何版本{baseOperate && projectType !==2 && 创建新版本}
-=======
- 您暂未发布任何版本{baseOperate && projectType !==2 && 创建新版本}
->>>>>>> 9be808e37f9c52698b7861d74cd537e356aafb6d
}