From 1bea1380bf1391821c2a0e35dcf8b6f4e49eb7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Wed, 5 Jun 2019 11:45:11 +0200
Subject: [PATCH] [release] v3.2.9
---
CMakeLists.txt | 4 ----
1 file changed, 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8e65d872e..8dce0c9049 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
LANGUAGES C CXX )
set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development
--
GitLab