Fix corrupt info plist

deacons · Apr 8, 2013 · 7b869ac · 7b869ac
1 parent 0424bea
commit 7b869ac
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/TDA-Enrichment/TDA-Enrichment-Info.plist b/TDA-Enrichment/TDA-Enrichment-Info.plist
@@ -39,11 +39,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-<<<<<<< HEAD
-	<string>1.1.1</string>
-=======
 	<string>1.1.2</string>
->>>>>>> 6cc649e... Increment version and build number
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -62,11 +58,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-<<<<<<< HEAD
-	<string>54</string>
-=======
 	<string>56</string>
->>>>>>> 6cc649e... Increment version and build number
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>