dos

Application/Common/Conf/config.php

@@ -13,11 +13,7 @@ return array(
     'AUTH_CLIENT_ID' => 'zhida_app',
     'AUTH_CLIENT_PASSWORD' => 'izhida',
     /* CDN路径配置。配置之后可以在模版文件中使用__CDN__ */
-<<<<<<< HEAD
-   '__CDN__' => 'http://cdn.iacode.cn/citic-mdrt4/v1.0.7/Public/static',
-=======
-    '__CDN__' => 'http://cdn.iacode.cn/citic-mdrt4/v1.0.6/Public/static',
->>>>>>> 685ca97d8e33f630b7e49b9a3ea4bcbbac3970cd
+   '__CDN__' => 'http://cdn.iacode.cn/citic-mdrt4/v1.0.8/Public/static',
     // '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里
     'URL_MODEL' => 3,
     'STORAGE_PATH' => WEB_ROOT_PATH . '/Data/Storage',