Ooops, missed a merge conflict string.

2026-01-07 12:15:28 -05:00
parent d8101b37b9
commit 5cf9e66895
1 changed files with 0 additions and 1 deletions
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,5 @@
 project('cthulhu',
  version: '2026.01.07-master',
->>>>>>> testing
  meson_version: '>= 1.0.0',
 )