From 76ff1745b523af39f6f21be3f74fc2a9e8c48f99 Mon Sep 17 00:00:00 2001
From: susott <37674058+susott@users.noreply.github.com>
Date: Sun, 9 Dec 2018 16:28:42 +0100
Subject: [PATCH] try to solve merge conflicts

---
 ios/drip.xcodeproj/project.pbxproj | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ios/drip.xcodeproj/project.pbxproj b/ios/drip.xcodeproj/project.pbxproj
index c80c17b..2827186 100644
--- a/ios/drip.xcodeproj/project.pbxproj
+++ b/ios/drip.xcodeproj/project.pbxproj
@@ -776,9 +776,9 @@
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				2B572382D4504B8FB4B9D251 /* Embed Frameworks */,
-				853FD03BE98A45968B26EEDC /* Build NodeJS Mobile Native Modules */,
-				8032B5E1DD5B4FE4BE67AE4A /* Sign NodeJS Mobile Native Modules */,
-				0DE12B33FBEF4D8583EA7537 /* Remove NodeJS Mobile Framework Simulator Strips */,
+				0244C597A2A04526BFF61B8C /* Build NodeJS Mobile Native Modules */,
+				9AAC1A9690414880B0E4B349 /* Sign NodeJS Mobile Native Modules */,
+				57F5EF05D2424834A33EAF38 /* Remove NodeJS Mobile Framework Simulator Strips */,
 			);
 			buildRules = (
 			);
@@ -1273,7 +1273,7 @@
 			shellPath = /bin/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;
 			buildActionMask = 2147483647;
 			files = (
@@ -1341,7 +1341,7 @@ fi
 popd
 ";
 		};
-		8032B5E1DD5B4FE4BE67AE4A /* Sign NodeJS Mobile Native Modules */ = {
+		9AAC1A9690414880B0E4B349 /* Sign NodeJS Mobile Native Modules */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			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
 ";
 		};
-		0DE12B33FBEF4D8583EA7537 /* Remove NodeJS Mobile Framework Simulator Strips */ = {
+		57F5EF05D2424834A33EAF38 /* Remove NodeJS Mobile Framework Simulator Strips */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (