匹配方式不同步

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -14,11 +14,7 @@
 <script src="/jyapp/mobiscroll/mobiscroll.min.js"></script>
 <script src="/jyapp/js/dropload.js?v={{Msg "seo" "version"}}12223"></script>
 <script type="text/javascript" src="/jyapp/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
-<<<<<<< HEAD
-<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}4"></script>
-=======
 <script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}123456"></script>
->>>>>>> 8edcaa42b65bd1bcff9500e45341eaebef8986d8
 <script type="text/javascript" src="/jyapp/js/bootstrap.min.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/popup/tap.js?v={{Msg "seo" "version"}}1"></script>
 <!--2.8-->