Merge branch 'conflict' merge completed

modified neue file
2024-09-13 20:29:18 +02:00 · 2024-09-13 20:20:42 +02:00
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
Author	SHA1	Message	Date
Alexander Schulz	b3d88b88f5	Merge branch 'conflict' merge completed	2024-09-13 20:29:18 +02:00
Alexander Schulz	1211942a0c	modified neue file	2024-09-13 20:20:42 +02:00
		`@ -1 +1 @@`
			`this is a hotfix`				`this is a hotfix and Das ist ein test für den Conflict aus dem branch conflict`