:bug: delete git merge conflict message

src/res/tpl/RepeatLoginScene.tpl

@@ -8,11 +8,7 @@
       <p>现在您不能使用。</p>
     </div>
     <div class="iknow" id="iknow-btn" fe-role="Widget">
-<<<<<<< HEAD
-      <img src="./../../stage/index/assets/img/RepeatLoginScene/repeat_login_ikonw_btn.png" alt="">
-=======
       <img src="assets/img/RepeatLoginScene/repeat_login_ikonw_btn.png" alt="">
->>>>>>> dev_base
     </div>
   </div>
 </div>