Skip to content

G
galaxy-iOS
Commit 21b911ac authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

// 解决冲突

parent 400d701f
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 21b911ac
......@@ -6678,11 +6678,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
<<<<<<< HEAD
CURRENT_PROJECT_VERSION = 1;
=======
CURRENT_PROJECT_VERSION = 7;
>>>>>>> double11
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -6732,11 +6728,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
<<<<<<< HEAD
CURRENT_PROJECT_VERSION = 1;
=======
CURRENT_PROJECT_VERSION = 7;
>>>>>>> double11
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment