From 951946bcd2a4d015525fb174347f98429a42fb7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sun, 12 Jun 2022 19:44:37 +0700
Subject: [PATCH] [rel] 3.2.59
---
CMakeLists.txt | 4 ----
1 file changed, 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b38e353148..d006faaf0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,11 +41,7 @@
# TODO:3.3: Require CMake 3.12
cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
project( CALAMARES
-<<<<<<< HEAD
- VERSION 3.2.54
-=======
VERSION 3.2.59
->>>>>>> 26cac052f58a1c38e723827d1773f0e805f4ee0d
LANGUAGES C CXX
)
--
GitLab