From d06098ff301ef83590d1f3ad8ffdfa845d00bd82 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Mon, 28 Nov 2016 10:17:07 +0000
Subject: [PATCH] Fix merge markers

---
 CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfc417281d..e38befe435 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)