README merged, conflicts resolved

readme change
2023-07-18 14:38:57 +02:00 · 2023-07-18 14:36:19 +02:00
1 changed files with 1 additions and 0 deletions
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
 # Test 2
 Hallo
 Wow!
Author	SHA1	Message	Date
Markwart von Bonin	250d4f157c	README merged, conflicts resolved	2023-07-18 14:38:57 +02:00
Markwart von Bonin	c47327961f	readme change	2023-07-18 14:36:19 +02:00