Fix merges

2023-12-13 10:37:51 +01:00 · 2023-12-13 10:37:51 +01:00 · 0f67fd5749
parent 4e030e9c2d 88b2b262d7
commit 0f67fd5749
3 changed files with 6 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
 mojabaza.sqlite
--- a/example.txt
+++ b/example.txt
@ -1 +1 @@
-Initial content
+Nekaj sem dodal v example.txt
--- a/file.txt
+++ b/file.txt
@ -1 +1,5 @@
 This is the first change.
 <<<<<<< HEAD
 =======
 This is the second change.
 >>>>>>> cpp
`@ -1 +1 @@`
	`Initial content`	`Nekaj sem dodal v example.txt`