Merge branch 'master' of https://git.nejcraft.cz/merk/nej

# Conflicts: # test.txt
2023-01-05 12:34:12 -05:00 · 2023-01-05 12:34:12 -05:00 · 6799fe4781
commit 6799fe4781
parent 9655d97d7d b1427d2ad4
2 changed files with 2 additions and 2 deletions
--- a/kopie.txt
+++ b/kopie.txt
@ -0,0 +1 @@
+tested
--- a/test.txt
+++ b/test.txt
@ -1,3 +1,2 @@
 tested
-
-test again
+added new line