Commit 542dc16d authored by Laurent Montel's avatar Laurent Montel 😁

Fix merge

parent 6cb3f8f2
......@@ -25,11 +25,7 @@ include(ECMCoverageOption)
set(LIBKLEO_LIB_VERSION ${PIM_VERSION})
set(QT_REQUIRED_VERSION "5.8.0")
<<<<<<< HEAD
set(KDEPIMTEXTEDIT_VERSION "5.7.40")
=======
set(KDEPIMTEXTEDIT_VERSION "5.7.0")
>>>>>>> Applications/17.12
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment