Commit 0e06ee58 authored by Jonathan Riddell's avatar Jonathan Riddell 🏄
Browse files

merge plasma/5.19

parent a1b563bb
......@@ -72,10 +72,7 @@ include_directories (
add_definitions(-DQT_NO_KEYWORDS)
add_definitions(-DQT_NO_FOREACH)
<<<<<<< HEAD
=======
>>>>>>> Plasma/5.18
add_subdirectory(daemon)
add_subdirectory(kcmodule)
add_subdirectory(doc)
......
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