修改web girlday控制器的活动id

youfu
Commit a0bfa2a10d9132e885c8b75b1cabe1388754602e 1 parent 3c23a4c6
Showing 1 changed file with 1 additions and 5 deletions
yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Girlday.php
--- a/yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Girlday.php
View file @a0bfa2a
+++ b/yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Girlday.php
View file @a0bfa2a
@@ -14,13 +14,9 @@ use Plugin\Helpers;
  */
 class GirldayController extends HuodongAction
 {
- <<<<<<< HEAD
+ 
     // const STATIC_VERSION = 'http://localhost:2222/1.0.1';
     const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2/1.0.1';
- =======
-     // const STATIC_VERSION = 'http://localhost:2222/1.0.2';
-     const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2/1.0.2';
- >>>>>>> 89ce101806024ff1d9da2d1507e6bef093cc26b1
 
     /**
      * 检测登录状态