修复浏览记录页面显示分支冲突错误信息的bug

@@ -277,14 +277,11 @@
 </script>
 </script>
 {{/if}}
 {{/if}}
 {{#if browseRecordPage}}
 {{#if browseRecordPage}}
-<<<<<<< HEAD
 <script>
 <script>
     seajs.use('js/me/browse-record');
     seajs.use('js/me/browse-record');
 </script>
 </script>
 {{/if}}
 {{/if}}
 {{#if logisticInfoPage}}
 {{#if logisticInfoPage}}
-=======
->>>>>>> feature/hf
 <script>
 <script>
     seajs.use('js/me/logistic');
     seajs.use('js/me/logistic');
 </script>
 </script>