Adding first test file

diff --git a/test1.txt b/test1.txt
new file mode 100644 (file)
index 0000000..662db96
--- /dev/null
+++ b/test1.txt
@@ -0,0 +1,5 @@
+This will be my test file
+
+The second line will be the one that should trigger a conflict.
+
+The thrid line will remain unchanged.