Fix merges

First change in cpp branch
Second change in cpp branch
2023-12-13 10:37:51 +01:00 · 2023-12-13 00:56:01 +01:00 · 2023-12-13 00:52:32 +01:00 · 2023-12-13 00:52:22 +01:00 · 2023-12-13 00:08:53 +01:00 · 2023-12-12 23:35:06 +01:00
4 changed files with 8 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+mojabaza.sqlite
--- a/example.txt
+++ b/example.txt
@ -0,0 +1 @@
+Nekaj sem dodal v example.txt
--- a/file.txt
+++ b/file.txt
@ -0,0 +1,5 @@
+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
+ 1337 feature\n 1338 feature\n 1339 feature\n 1331 feature\n ojla\n ojla
Author	SHA1	Message	Date
Gašper Spagnolo	0f67fd5749	Fix merges	2023-12-13 10:37:51 +01:00
Gašper Spagnolo	4e030e9c2d	First change in cpp branch	2023-12-13 00:56:01 +01:00
Gašper Spagnolo	88b2b262d7	Second change in cpp branch	2023-12-13 00:52:32 +01:00
Gašper Spagnolo	b18a08c160	First change in cpp branch	2023-12-13 00:52:22 +01:00
Gašper Spagnolo	9fdd5980c4	Add example.txt with initial content	2023-12-13 00:08:53 +01:00
Gašper Spagnolo	b4fac5567a	Se en popravek datoteke	2023-12-12 23:35:06 +01:00
Gašper Spagnolo	b31d72bc79	Dodaj nekaj novega v datoteko	2023-12-12 23:33:55 +01:00