@@ -86,7 +86,11 @@
},
"iosStyle" : "storyboard",
"ios" : {
+<<<<<<< HEAD
"storyboard" : "C:/Users/Administrator/Desktop/正一.zip"
+=======
+ "storyboard" : "C:/Users/Administrator/Desktop/zhengyi/正一/正一.zip"
+>>>>>>> a15777ea49b9810e4ca51b75479c55765833f567
}
"icons" : {
