Merge branch 'conflict' merge completed

2024-09-13 20:29:18 +02:00
parent cf582793f9 1211942a0c
commit b3d88b88f5
1 changed files with 1 additions and 1 deletions
--- a/file.txt
+++ b/file.txt
@ -1 +1 @@
-this is a hotfix
+this is a hotfix and Das ist ein test für den Conflict aus dem branch conflict