ok

2019-08-08 21:15:38 +08:00 · 2019-08-08 21:15:38 +08:00 · 4b8f9cf118
commit 4b8f9cf118
parent 6476d7f332
1 changed files with 0 additions and 4 deletions
--- a/themes/next/source/css/_variables/custom.styl
+++ b/themes/next/source/css/_variables/custom.styl
@ -2,8 +2,4 @@
 $content-desktop = 700px

 // 当视窗超过 1600px 后的宽度
-<<<<<<< HEAD
-$content-desktop-large = 700px
-=======
 $content-desktop-large = 900px
->>>>>>> abb65e61b75d94e9b265e42e76a0b58ee73b5e69