Fix merge error

Sorry about that, I think I gotfor to `git add` the file before completing the merge
7 years ago · b65b360b0a
parent 64ff880c05
commit b65b360b0a
1 changed files with 0 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,11 +1,7 @@
 cmake_minimum_required(VERSION 3.0)

 project(plasma-workspace)
-<<<<<<< HEAD
 set(PROJECT_VERSION "5.15.80")
-=======
-set(PROJECT_VERSION "5.15.4")
->>>>>>> Plasma/5.15
 set(PROJECT_VERSION_MAJOR 5)

 set(QT_MIN_VERSION "5.12.0")