From aa9e9836b46534b886ae3c2e05d9b2bed8288ab5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 7 Jan 2016 17:06:52 -0800
Subject: [PATCH] repair another committed conflict

---
 interface/CMakeLists.txt | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 995dee8f69..10bb83ed1d 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -208,17 +208,10 @@ if (APPLE)
 
   target_link_libraries(${TARGET_NAME} ${OpenGL} ${AppKit})
 
-<<<<<<< HEAD
   # setup install of OS X interface bundle
   install(TARGETS ${TARGET_NAME}
     BUNDLE DESTINATION ${INTERFACE_INSTALL_DIR}
     COMPONENT ${CLIENT_COMPONENT}
-=======
-  # install command for OS X bundle
-  INSTALL(TARGETS ${TARGET_NAME}
-    BUNDLE DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/install" COMPONENT Runtime
-    RUNTIME DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/install" COMPONENT Runtime
->>>>>>> ebdd430... use external project hack on win only
   )
 
 else (APPLE)