%!s(int64=2) %!d(string=hai) anos · 1d7c1e8792
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,6 @@
 
				 {
			
 
				-<<<<<<< HEAD
			
 
				     "name" : "振合网",
			
 
				-=======
			
 
				-    "name" : "振合网招商邀请函",
			
 
				->>>>>>> 80bf65e6fbd3953e8e8f891ec273f243d1e63d95
			
 
				-    "appid" : "__UNI__E870E93",
			
 
				+    "appid" : "__UNI__A51A853",
			
 
				     "description" : "",
			
 
				     "versionName" : "1.0.13",
			
 
				     "versionCode" : 101,