diff --git a/adventure.txt b/adventure.txt new file mode 100644 index 0000000..d2f1c22 --- /dev/null +++ b/adventure.txt @@ -0,0 +1,2 @@ +I am making changes that will cause meerge conflicts. +