aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Edmundson <[email protected]>2016-11-28 10:17:07 +0000
committerDavid Edmundson <[email protected]>2016-11-28 10:17:07 +0000
commitd06098ff301ef83590d1f3ad8ffdfa845d00bd82 (patch)
tree8d4df973fa8548e292e2d1780d1a4c2ca52df41d
parentf34222e060824bb776de2e6f149947acb326f284 (diff)
Fix merge markers
-rw-r--r--CMakeLists.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfc4172..e38befe 100644
--- 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)