From 5cf9e66895e19f32d98905522a97432d3da29f87 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Wed, 7 Jan 2026 12:15:28 -0500
Subject: [PATCH] Ooops, missed a merge conflict string.

---
 meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meson.build b/meson.build
index 07a5e94..8fea647 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,5 @@
 project('cthulhu',
   version: '2026.01.07-master',
->>>>>>> testing
   meson_version: '>= 1.0.0',
 )