[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwin] /: Fix merge markers
From:       David Edmundson <kde () davidedmundson ! co ! uk>
Date:       2016-11-28 10:17:26
Message-ID: E1cBJ02-0002BI-Pi () code ! kde ! org
[Download RAW message or body]

Git commit d06098ff301ef83590d1f3ad8ffdfa845d00bd82 by David Edmundson.
Committed on 28/11/2016 at 10:17.
Pushed by davidedmundson into branch 'master'.

Fix merge markers

M  +0    -4    CMakeLists.txt

https://commits.kde.org/kwin/d06098ff301ef83590d1f3ad8ffdfa845d00bd82

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)
[prev in list] [next in list] [prev in thread] [next in thread]