A non-conflicting change

2021-10-23 12:18:09 -04:00 · 2021-10-23 12:18:09 -04:00 · 5171313fd6
commit 5171313fd6
parent b99b892baf
1 changed files with 2 additions and 0 deletions
--- a/dan.txt
+++ b/dan.txt
@ -1 +1,3 @@
 this is a new file only in my branch
+
+changing something that won't conflict in master