Fix xcode project
This commit is contained in:
parent
a6bbaeb580
commit
5ea8ff1685
|
@ -989,11 +989,7 @@
|
|||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
<<<<<<< HEAD
|
||||
CURRENT_PROJECT_VERSION = 2.0.0;
|
||||
=======
|
||||
CURRENT_PROJECT_VERSION = 2.0.0;
|
||||
>>>>>>> b3ff7ada624f9fcb6d6ad6abf19e862059513857
|
||||
CXX = "$(SRCROOT)/../scripts/ccache-clang++.sh";
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
|
@ -1057,11 +1053,7 @@
|
|||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
<<<<<<< HEAD
|
||||
CURRENT_PROJECT_VERSION = 2.0.0;
|
||||
=======
|
||||
CURRENT_PROJECT_VERSION = 2.0.0;
|
||||
>>>>>>> b3ff7ada624f9fcb6d6ad6abf19e862059513857
|
||||
CXX = "$(SRCROOT)/../scripts/ccache-clang++.sh";
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
ENABLE_NS_ASSERTIONS = NO;
|
||||
|
|
Loading…
Reference in New Issue