From ea11d13c11c2c38ebe6d74098cd6be8cab542c90 Mon Sep 17 00:00:00 2001 From: balandinodidonato Date: Wed, 26 Apr 2017 00:50:33 +0100 Subject: [PATCH] project file update due to parsing errors --- .../MacOSX/Myo Mapper.xcodeproj/project.pbxproj | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Myo Mapper/Builds/MacOSX/Myo Mapper.xcodeproj/project.pbxproj b/Myo Mapper/Builds/MacOSX/Myo Mapper.xcodeproj/project.pbxproj index 09a8460..2555d55 100644 --- 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; };