Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[addlayerbutton] Removed merge markers
  • Loading branch information
elpaso committed Jun 2, 2017
1 parent a69d512 commit 84bbb5f
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/app/CMakeLists.txt
Expand Up @@ -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}
Expand Down

0 comments on commit 84bbb5f

Please sign in to comment.