1

www/protected/modules/o2o/views/web/index.php

@@ -56,11 +56,6 @@
             var wxUserID = localStorage.setItem("wxUserID",  "'.$userId.'");
             var appToken = localStorage.setItem("appToken", "'.$appToken.'");
           ';
-<<<<<<< HEAD
-=======
-        } else {
-         // echo 'localStorage.clear();';
->>>>>>> 5ef8a77ac097c4e303eebbde4c457727975192c4
         }
       ?>
       var userID = localStorage.getItem('wxUserID');