Fix merge markers

9 years ago · d06098ff30
parent f34222e060
commit d06098ff30
1 changed files with 0 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,9 +1,5 @@
 project(KWIN)
-<<<<<<< HEAD
 set(PROJECT_VERSION "5.8.90")
-=======
-set(PROJECT_VERSION "5.8.4")
->>>>>>> Plasma/5.8
 set(PROJECT_VERSION_MAJOR 5)

 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)