4 changed files with 1 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +0,0 @@
 mojabaza.sqlite
--- a/example.txt
+++ b/example.txt
@ -1 +0,0 @@
 Nekaj sem dodal v example.txt
--- a/file.txt
+++ b/file.txt
@ -1,5 +0,0 @@
 This is the first change.
 <<<<<<< HEAD
 =======
 This is the second change.
 >>>>>>> cpp
--- a/prva_datoteka.txt
+++ b/prva_datoteka.txt
@ -1,3 +1,3 @@
 #TO JE PRVA DATOTEKA
- 1337 feature\n 1338 feature\n 1339 feature\n 1331 feature\n ojla\n ojla
+ 1337 feature\n 1338 feature\n 1339 feature\n 1331 feature
`@ -1,3 +1,3 @@`
	`#TO JE PRVA DATOTEKA`	`#TO JE PRVA DATOTEKA`

	`1337 feature\n 1338 feature\n 1339 feature\n 1331 feature\n ojla\n ojla`	`1337 feature\n 1338 feature\n 1339 feature\n 1331 feature`