From 3f435d62b57a4eb090728f3b468d9024a553ade9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Wed, 3 Mar 2021 14:17:00 +0100
Subject: [PATCH] [release] 3.2.37

---
 CMakeLists.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bd20796a..421a50062 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,14 +41,9 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-<<<<<<< HEAD
-    VERSION 3.2.34
-    LANGUAGES C CXX )
-=======
-    VERSION 3.2.38
+    VERSION 3.2.37
     LANGUAGES C CXX
 )
->>>>>>> 1496173b2c1aceaadf7ec4af63ea5b611b7d37fd
 
 set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development