diff --git a/test.txt b/test.txt index 363a057..4c0d51b 100644 --- a/test.txt +++ b/test.txt @@ -9,3 +9,9 @@ Funny little trees. Happy little clouds! This was written on my local Computer via vim and git. + +<<<<<<< HEAD +STUFF FOR NEWBRANCH +======= +I will now try to push to another branch. +>>>>>>> master