From 14ed57477d785e2a41241a76b9a516b824b0e17f Mon Sep 17 00:00:00 2001
From: wanyiwei <wan.yiwei@free-sun.com.cn>
Date: Wed, 27 Jul 2022 11:37:39 +0800
Subject: [PATCH] =?UTF-8?q?*=E5=A4=A7=E5=B1=8F=E8=BF=90=E8=90=A5=E5=BC=95?=
 =?UTF-8?q?=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sections/quanju/containers/footer/operation/index.js    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/web/client/src/sections/quanju/containers/footer/operation/index.js b/web/client/src/sections/quanju/containers/footer/operation/index.js
index 1de89f55..77e19a00 100644
--- a/web/client/src/sections/quanju/containers/footer/operation/index.js
+++ b/web/client/src/sections/quanju/containers/footer/operation/index.js
@@ -17,15 +17,9 @@ const Operation = (props) => {
     }, [])
 
     return (
-        // <<<<<<< HEAD
-        //         <div style={{ display: 'flex', width: '100%', height: '100%', justifyContent: 'space-between' }}>
-        //             <Left />
-        //             <Right />
-        // =======
         <div style={{ display: 'flex', width: '100%', height: '100%', justifyContent: 'space-between' }}>
             <Left roadData={roadData} loading={loading} />
             <Right roadData={roadData} loading={loading} />
-            {/* >>>>>>> 385f017aeac33adc39a31e75faf6254a1a881d16 */}
         </div>
     )
 }