From 4b8f9cf1187d87e3230fc19068d0f0fd8a9d8c0f Mon Sep 17 00:00:00 2001
From: Cool-Y <1072916769@qq.com>
Date: Thu, 8 Aug 2019 21:15:38 +0800
Subject: [PATCH] ok

---
 themes/next/source/css/_variables/custom.styl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/themes/next/source/css/_variables/custom.styl b/themes/next/source/css/_variables/custom.styl
index a15b793b..37a0b55e 100644
--- 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