chore: remove merge conflict CI test marker

This commit is contained in:
MervinPraison committed 2026-06-24 09:04:52 +01:00
1 parent d516d9e538
commit c55303684a
1 file changed
-1
-1
View File
@@ -1 +0,0 @@
main-side