Solve remaining merge conflict

parent 5f6ff4c0
Pipeline #5344 passed with stages
in 33 minutes and 12 seconds
......@@ -58,12 +58,8 @@ kde_enable_exceptions()
find_package(PkgConfig REQUIRED)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Qml Quick Svg Sql QuickControls2 Xml Multimedia)
find_package(KF5Kirigami2 REQUIRED)
<<<<<<< HEAD
find_package(ZXing REQUIRED COMPONENTS Core)
pkg_search_module(QXmpp REQUIRED qxmpp>=1.0)
pkg_search_module(QXmpp REQUIRED qxmpp>=0.8.3)
>>>>>>> stable
# Optional QtQuickCompiler
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