Ooops, missed a merge conflict string.
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
project('cthulhu',
|
project('cthulhu',
|
||||||
version: '2026.01.07-master',
|
version: '2026.01.07-master',
|
||||||
>>>>>>> testing
|
|
||||||
meson_version: '>= 1.0.0',
|
meson_version: '>= 1.0.0',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user