Commit 4562b648 authored by Nicolas Fella's avatar Nicolas Fella
Browse files

Fix bad merge

parent 998aa365
Pipeline #41246 passed with stage
in 12 minutes and 33 seconds
......@@ -36,11 +36,7 @@ include(ECMSetupQtPluginMacroNames)
include(AkonadiMacros)
set(QT_REQUIRED_VERSION "5.13.0")
<<<<<<< HEAD
set(RELEASE_SERVICE_VERSION "21.03.80")
=======
set(RELEASE_SERVICE_VERSION "20.11.90")
>>>>>>> release/20.12
set(AKONADI_FULL_VERSION "${PIM_VERSION} (${RELEASE_SERVICE_VERSION})")
configure_file(akonadifull-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/akonadifull-version.h @ONLY)
......
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