1.提到公共

mods/components/3dviewConvertor/view/View3D.js

@@ -1460,16 +1460,6 @@ class View3D extends Component {
               />
 
             }
-<<<<<<< HEAD
-=======
-
-            <div className='topBox'>
-              <span className='editTitle'>
-                <span className='titleText'>编辑模式</span>
-              </span>
-              <span className='quipBtn' onClick={this.quitEditMode}></span>
-            </div>
->>>>>>> c22bff23958536ca788be2c9cf7316bdd7f6153d
             <div className='bottomBox'>
               <span className={`editAreaBtn ${pageType == 'region'?'selected':'noSelect'}`} onClick={this.changeAreaPoint.bind(this,'region')}></span>
               <span className={`editPointBtn ${pageType == 'point'?'selected':'noSelect'}`} onClick={this.changeAreaPoint.bind(this,'point')}></span>