From 7864ddc4de9c89f1986f1918180883a5c3580a5b Mon Sep 17 00:00:00 2001
From: Brett Laptop <tri11paragon@tpgc.me>
Date: Wed, 15 Jan 2025 19:15:11 -0500
Subject: [PATCH] fix cmake

---
 CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a17b6c3..01485c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 include(cmake/color.cmake)
-<<<<<<< HEAD
 set(BLT_VERSION 2.1.16)
-=======
-set(BLT_VERSION 2.1.14)
->>>>>>> cf6cbbd (make write profile work)
 
 set(BLT_TARGET BLT)