From ef18ae7cbcc2a589f99668b84020dc48e3b4b3f1 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Tue, 30 Dec 2025 05:33:58 -0500
Subject: [PATCH] Oops, fixed meson.build

---
 meson.build | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/meson.build b/meson.build
index bc765b6..9dcd9f8 100644
--- a/meson.build
+++ b/meson.build
@@ -1,9 +1,5 @@
 project('cthulhu',
-<<<<<<< HEAD
   version: '2025.12.30-master',
-=======
-  version: '2025.12.30-master',
->>>>>>> testing
   meson_version: '>= 1.0.0',
 )