add

miaomiao/www/js/config/config.js

@@ -1,13 +1,8 @@
 (function (app) {
     //全局配置 
     app.constant("config", {
-<<<<<<< HEAD
-        //server: 'http://q8.9026.com/',
-        //imgServer: 'http://q8.9026.com/attachment/'
-=======
         // server: 'http://q8.9026.com/',
         // imgServer: 'http://q8.9026.com/attachment/'
->>>>>>> dcb34b12268cd4b10e89d9ac3dbb8058618bc511
         //server: 'http://localhost:8092/',
         //imgServer: 'http://localhost:8092/attachment/'