project file update due to parsing errors

balandinodidonato · Apr 25, 2017 · ea11d13 · ea11d13
1 parent 230bf90
commit ea11d13
Showing 1 changed file with 0 additions and 16 deletions.
diff --git a/Myo Mapper/Builds/MacOSX/Myo Mapper.xcodeproj/project.pbxproj b/Myo Mapper/Builds/MacOSX/Myo Mapper.xcodeproj/project.pbxproj
@@ -1969,26 +1969,10 @@
 				HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../../../Applications/JUCE/modules", "$(inherited)");
 				INFOPLIST_FILE = Info-App.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-<<<<<<< HEAD
-<<<<<<< HEAD
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
-=======
-<<<<<<< HEAD
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
-=======
-<<<<<<< HEAD
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-=======
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
->>>>>>> develop
->>>>>>> release
->>>>>>> release
-=======
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
->>>>>>> develop
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.balandinodidonato.MyoMapper;
 				SDKROOT_ppc = macosx10.5; }; name = Release; };