Merge pull request #62 from danswiger/master

Minor change - hey, I am happy to merge your test PR, just so you can see what happens!
2021-10-24 17:21:20 +02:00
parent a01b7130b8 e0fff7d62e
commit 28dd92bcec
2 changed files with 5 additions and 0 deletions
--- a/dan.txt
+++ b/dan.txt
@@ -0,0 +1,3 @@
+this is a new file only in my branch
+
+changing something that won't conflict in master
--- a/e.txt
+++ b/e.txt
@@ -1 +1,3 @@
 e
+
+MiNor Change