From 5171313fd649eb236d12b368733296af079b6cce Mon Sep 17 00:00:00 2001
From: dswiger <dswag89@gmail.com>
Date: Sat, 23 Oct 2021 12:18:09 -0400
Subject: [PATCH] A non-conflicting change

---
 dan.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dan.txt b/dan.txt
index 33d8047..075c326 100644
--- 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