lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try to solve merge conflicts

Browse Source
This commit is contained in:
susott
2018-12-09 16:28:42 +01:00
parent 5444278795
commit 76ff1745b5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/drip.xcodeproj/project.pbxproj
+6 -6
View File
@@ -776,9 +776,9 @@
13B07F8E1A680F5B00A75B9A /* Resources */, 13B07F8E1A680F5B00A75B9A /* Resources */,
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
2B572382D4504B8FB4B9D251 /* Embed Frameworks */, 2B572382D4504B8FB4B9D251 /* Embed Frameworks */,
853FD03BE98A45968B26EEDC /* Build NodeJS Mobile Native Modules */, 0244C597A2A04526BFF61B8C /* Build NodeJS Mobile Native Modules */,
8032B5E1DD5B4FE4BE67AE4A /* Sign NodeJS Mobile Native Modules */, 9AAC1A9690414880B0E4B349 /* Sign NodeJS Mobile Native Modules */,
0DE12B33FBEF4D8583EA7537 /* Remove NodeJS Mobile Framework Simulator Strips */, 57F5EF05D2424834A33EAF38 /* Remove NodeJS Mobile Framework Simulator Strips */,
); );
buildRules = ( buildRules = (
); );
@@ -1273,7 +1273,7 @@
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
}; };
853FD03BE98A45968B26EEDC /* Build NodeJS Mobile Native Modules */ = { 0244C597A2A04526BFF61B8C /* Build NodeJS Mobile Native Modules */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
@@ -1341,7 +1341,7 @@ fi
popd popd
"; ";
}; };
8032B5E1DD5B4FE4BE67AE4A /* Sign NodeJS Mobile Native Modules */ = { 9AAC1A9690414880B0E4B349 /* Sign NodeJS Mobile Native Modules */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
@@ -1401,7 +1401,7 @@ find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -path \"*/*.framework/*\" -del
find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d -delete find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d -delete
"; ";
}; };
0DE12B33FBEF4D8583EA7537 /* Remove NodeJS Mobile Framework Simulator Strips */ = { 57F5EF05D2424834A33EAF38 /* Remove NodeJS Mobile Framework Simulator Strips */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (