diff --git a/dan.txt b/dan.txt new file mode 100644 index 0000000..075c326 --- /dev/null +++ b/dan.txt @@ -0,0 +1,3 @@ +this is a new file only in my branch + +changing something that won't conflict in master diff --git a/e.txt b/e.txt index d905d9d..e3ef1bf 100644 --- a/e.txt +++ b/e.txt @@ -1 +1,3 @@ e + +MiNor Change