cmake: Fix CACHE_ARGS merge

thewtex · thewtex · commit 80c61041a52c · 2018-12-20T21:31:05.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -206,11 +206,7 @@ if(ITKPythonPackage_SUPERBUILD)
       SOURCE_DIR ${ITK_SOURCE_DIR}
       BINARY_DIR ${ITK_BINARY_DIR}
       PREFIX "ITKp"
-<<<<<<< HEAD
-      CMAKE_CACHE_ARGS
-=======
       CMAKE_ARGS
->>>>>>> master
         -DBUILD_TESTING:BOOL=OFF
         -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
         -DPY_SITE_PACKAGES_PATH:PATH=${CMAKE_INSTALL_PREFIX}
