[CHORE] 컨플릭 해결

kimkyuchul · Mar 1, 2024 · 97a511b · 97a511b
1 parent 9a5ee24
commit 97a511b
Showing 1 changed file with 0 additions and 23 deletions.
diff --git a/Makgulli.xcodeproj/project.pbxproj b/Makgulli.xcodeproj/project.pbxproj
@@ -1874,14 +1874,9 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Makgulli/Makgulli.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-<<<<<<< HEAD
 				CURRENT_PROJECT_VERSION = 4;
 				CODE_SIGN_STYLE = Manual;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-=======
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
->>>>>>> main
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8LJ2P85FNV;
@@ -1922,17 +1917,11 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Makgulli/Makgulli.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-<<<<<<< HEAD
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8LJ2P85FNV;
 				DEVELOPMENT_TEAM = "";
 				CURRENT_PROJECT_VERSION = 4;
 				CODE_SIGN_STYLE = Manual;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-=======
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
-				DEVELOPMENT_TEAM = 8LJ2P85FNV;
->>>>>>> main
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Makgulli/Common/Resource/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "주막";
@@ -1969,11 +1958,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-<<<<<<< HEAD
-				CURRENT_PROJECT_VERSION = 4;
-=======
 				CURRENT_PROJECT_VERSION = 4;
->>>>>>> main
 				DEVELOPMENT_TEAM = 8LJ2P85FNV;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
@@ -1994,11 +1979,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-<<<<<<< HEAD
 				CURRENT_PROJECT_VERSION = 4;
-=======
-				CURRENT_PROJECT_VERSION = 4;
->>>>>>> main
 				DEVELOPMENT_TEAM = 8LJ2P85FNV;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
@@ -2018,11 +1999,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-<<<<<<< HEAD
-				CURRENT_PROJECT_VERSION = 4;
-=======
 				CURRENT_PROJECT_VERSION = 4;
->>>>>>> main
 				DEVELOPMENT_TEAM = 8LJ2P85FNV;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;