Fixes a merge conflict in the project file

zerozheng · Sep 29, 2016 · fa11bca · fa11bca
1 parent b6f2d02
commit fa11bca
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/ImagePicker.xcodeproj/project.pbxproj b/ImagePicker.xcodeproj/project.pbxproj
@@ -272,18 +272,7 @@
 				TargetAttributes = {
 					D5DC598A1C201BE1003BD79B = {
 						CreatedOnToolsVersion = 7.2;
-<<<<<<< HEAD
-=======
 						DevelopmentTeam = QQJ8AA32HJ;
->>>>>>> 456f703fa0a66f3dacb74dc3fa079f007e3ffe27
-						LastSwiftMigration = 0800;
-					};
-					D5DC59941C201BE1003BD79B = {
-						CreatedOnToolsVersion = 7.2;
-<<<<<<< HEAD
-=======
-						DevelopmentTeam = QQJ8AA32HJ;
->>>>>>> 456f703fa0a66f3dacb74dc3fa079f007e3ffe27
 						LastSwiftMigration = 0800;
 					};
 				};

diff --git a/ImagePicker.xcodeproj/project.xcworkspace/xcshareddata/ImagePicker.xcscmblueprint b/ImagePicker.xcodeproj/project.xcworkspace/xcshareddata/ImagePicker.xcscmblueprint
@@ -10,7 +10,7 @@
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "B77C8114-D371-4E10-8033-32ED4AA00143",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
     "DD6144A9FB4D66DBB8AF354930B70BC27549910A" : "",
-    "B763FC9623928D804BC7C9A73D90792E4628A1CE" : "ImagePicker-swift3\/"
+    "B763FC9623928D804BC7C9A73D90792E4628A1CE" : "ImagePicker\/"
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "ImagePicker",
   "DVTSourceControlWorkspaceBlueprintVersion" : 204,