summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-09-30 10:16:48 +0200
committerMontel Laurent <[email protected]>2017-09-30 10:16:48 +0200
commitd8fe1f964d1f1dce7620ad00370c65416115063b (patch)
treef53b8c990bf1bc2072f1aeb518e24e2d7058a168
parent43cc42114bfd19c6aee62e4324cb982ccfb59e9c (diff)
Fix merge error
-rw-r--r--CMakeLists.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 384776e..45fc0ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,11 +107,7 @@ if (NOT ${MIMETREEPARSER_ONLY_BUILD})
find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5SendLater ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
-<<<<<<< HEAD
find_package(KF5AkonadiSearch "5.6.40" CONFIG REQUIRED)
-=======
- find_package(KF5AkonadiSearch "5.6.2" CONFIG REQUIRED)
->>>>>>> origin/Applications/17.08
set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
endif()