Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/Highways4Good into dev

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>
     )
 }