From b65b360b0ad066663327c10d3b356b4277f59041 Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Tue, 9 Apr 2019 10:11:55 -0600
Subject: [PATCH] Fix merge error Sorry about that, I think I gotfor to `git
 add` the file before completing the merge

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81616cc55..9136ceea7 100644
--- 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")