Oops, fixed meson.build

2025-12-30 05:33:58 -05:00
parent 4f210406d3
commit ef18ae7cbc
1 changed files with 0 additions and 4 deletions
--- 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',
 )