登录

@@ -101,11 +101,7 @@
     "yoho-handlebars": "^4.0.5",
     "yoho-handlebars": "^4.0.5",
     "yoho-jquery": "^1.12.4",
     "yoho-jquery": "^1.12.4",
     "yoho-jquery-lazyload": "^1.9.7",
     "yoho-jquery-lazyload": "^1.9.7",
-<<<<<<< HEAD
     "yoho-jquery-placeholder": "^2.3.1",
     "yoho-jquery-placeholder": "^2.3.1",
-=======
-    "yoho-jquery-placeholder": "0.0.3",
->>>>>>> develop
     "yoho-slider": "0.0.2"
     "yoho-slider": "0.0.2"
   }
   }
 }
 }

@@ -546,7 +546,7 @@ function actionCover() {
         $('#cover .guide-box').bind('click', function(e) {
         $('#cover .guide-box').bind('click', function(e) {
             e.stopPropagation();
             e.stopPropagation();
         });
         });
-    });
+    }
 }
 }
 
 
 actionCover();
 actionCover();