Skip to content

万
万科
Commit 6cdc809b authored by Sandy's avatar Sandy
Browse files
Options

合并冲突 fix

parent 97364a5f
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 5 deletions
vanke.xcodeproj/project.pbxproj
View file @ 6cdc809b
...@@ -4193,6 +4193,7 @@ ...@@ -4193,6 +4193,7 @@
C1D58B131BB1BC9200D297FE /* Frameworks */, C1D58B131BB1BC9200D297FE /* Frameworks */,
C1D58B141BB1BC9200D297FE /* Resources */, C1D58B141BB1BC9200D297FE /* Resources */,
5CBECAF0D12B43E974C62C13 /* Copy Pods Resources */, 5CBECAF0D12B43E974C62C13 /* Copy Pods Resources */,
D835305684DFA24CB227F834 /* Embed Pods Frameworks */,
); );
buildRules = ( buildRules = (
); );
...@@ -4478,6 +4479,21 @@ ...@@ -4478,6 +4479,21 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n"; shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
D835305684DFA24CB227F834 /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */
...@@ -5092,14 +5108,9 @@ ...@@ -5092,14 +5108,9 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = NO; CLANG_ENABLE_MODULES = NO;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = NO; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = NO;
<<<<<<< HEAD
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
=======
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMPRESS_PNG_FILES = NO; COMPRESS_PNG_FILES = NO;
>>>>>>> 6993c6f471881a8dd9a4e875913b5122d815d98f
ENABLE_STRICT_OBJC_MSGSEND = NO; ENABLE_STRICT_OBJC_MSGSEND = NO;
GCC_PREFIX_HEADER = vanke/vanke.pch; GCC_PREFIX_HEADER = vanke/vanke.pch;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
......
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