add

miaomiao/config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.miaomiao.app" version="0.0.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.miaomiao.app" version="0.0.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>瞄喵</name>
   <description>
         An Ionic Framework and Cordova project.

miaomiao/www/js/config/config.js

@@ -1,8 +1,13 @@
 (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/'
+>>>>>>> d684ce7718047987c6835496179130b948b131a5
         //server: 'http://localhost:8092/',
         //imgServer: 'http://localhost:8092/attachment/'