From 8855b0e4b7013e4a2642ed943d230db1607160b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sat, 11 May 2019 09:31:27 +0200
Subject: [PATCH] [release] fix version
---
CMakeLists.txt | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4b6ad8d23..04aa82397a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,11 +37,7 @@
cmake_minimum_required( VERSION 3.2 FATAL_ERROR )
project( CALAMARES
-<<<<<<< HEAD
- VERSION 3.2.7.1
-=======
- VERSION 3.2.9
->>>>>>> development
+ VERSION 3.2.8
LANGUAGES C CXX )
set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development
--
GitLab