Skip to content
Permalink
Browse files

[addlayerbutton] Removed merge markers

  • Loading branch information
elpaso committed Jun 2, 2017
1 parent a69d512 commit 84bbb5f44588aca1e04ce781b439da5151c51d79
Showing with 0 additions and 1 deletion.
  1. +0 −1 src/app/CMakeLists.txt
@@ -569,7 +569,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/src/native
)
INCLUDE_DIRECTORIES(SYSTEM
>>>>>>> [addlayerbutton] Added WFS, WMS and vector layers
${SPATIALITE_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}

0 comments on commit 84bbb5f

Please sign in to comment.
You can’t perform that action at this time.