no message

edad2f9d · 管鹏飞 · 4346f77e · edad2f9d
Commit edad2f9d authored Nov 05, 2015 by 管鹏飞
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

Info.plist XFFruit/Info.plist +1 -5

No files found.
--- a/XFFruit/Info.plist
+++ b/XFFruit/Info.plist
@@ -17,11 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-<<<<<<< HEAD
-	<string>1.0.1</string>
-=======
-	<string>1.0</string>
->>>>>>> 1de7a49b4d56cfdf4ff3774d83fe3795c134012e
+	<string>1.0.2</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>