test: main-side merge conflict marker for CI automation test

This commit is contained in:
MervinPraison committed 2026-06-24 08:59:59 +01:00
1 parent fd038d054e
commit dcef9ff502
1 file changed
+1
+1
View File
@@ -0,0 +1 @@
main-side