summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPino Toscano <[email protected]>2017-06-03 00:52:32 +0200
committerPino Toscano <[email protected]>2017-06-03 00:52:32 +0200
commit785ea385b5ee3a0e380bebf058a24aebe5a47dae (patch)
treecafe55d980ea41509d42a099d0d1e550e3c142ad
parenta561526afd77329146316fef7bf024b1a61bef14 (diff)
fix merge from Applications/17.04
-rw-r--r--CMakeLists.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7979987..9b3efa7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,11 +143,7 @@ set_package_properties(Sasl2 PROPERTIES
)
# Extra package
-<<<<<<< HEAD
find_package(KPimGAPI "5.5.40" CONFIG)
-=======
-find_package(KPimGAPI "5.5.2" CONFIG)
->>>>>>> Applications/17.04
add_subdirectory(resources)