Commit 785ea385 authored by Pino Toscano's avatar Pino Toscano

fix merge from Applications/17.04

parent a561526a
......@@ -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)
......
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