fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by Rock Zhang
Commit 23e4c31b2d1804f07decb414f1247b64852d1213 1 parent 3fd4b565

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

Inline Side-by-side
Showing 1 changed file with 0 additions and 3 deletions
... ... @@ -277,14 +277,11 @@
</script>
{{/if}}
{{#if browseRecordPage}}
<<<<<<< HEAD
<script>
seajs.use('js/me/browse-record');
</script>
{{/if}}
{{#if logisticInfoPage}}
=======
>>>>>>> feature/hf
<script>
seajs.use('js/me/logistic');
</script>
... ...