修改web girlday控制器的活动id

@@ -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
 
     /**
      * 检测登录状态