testing merge conflicts on main

2022-06-05 19:20:21 +02:00
parent 6bcf913cea
commit ba8bf8527e
1 changed files with 1 additions and 1 deletions
--- a/testfile.txt
+++ b/testfile.txt
@@ -1 +1 @@
-this is a test
+this is a testfile on main