- Fix some rebase conflits.

owncloud · May 16, 2018 · ecaff2b · ecaff2b
1 parent 911bab1
commit ecaff2b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/OC Share Sheet/Info.plist b/OC Share Sheet/Info.plist
@@ -17,11 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-<<<<<<< HEAD
-	<string>3.7.4</string>
-=======
 	<string>3.7.5</string>
->>>>>>> ee269d28... - Version number bumped
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Owncloud iOs Client/Owncloud iOs Client-Info.plist b/Owncloud iOs Client/Owncloud iOs Client-Info.plist
@@ -49,11 +49,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-<<<<<<< HEAD
-	<string>3.7.4</string>
-=======
 	<string>3.7.5</string>
->>>>>>> ee269d28... - Version number bumped
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>