Revert "user2's changes"
authorGary Macbook <gsteele13@gmail.com>
Thu, 19 Nov 2015 13:02:35 +0000 (14:02 +0100)
committerGary Macbook <gsteele13@gmail.com>
Thu, 19 Nov 2015 13:02:35 +0000 (14:02 +0100)
Now I'm not sure what is going on

This reverts commit b3a8796f786699d7ee19db40b59e99ef935546d8.

Conflicts:
test1.txt

test1.txt [deleted file]

diff --git a/test1.txt b/test1.txt
deleted file mode 100644 (file)
index e69de29..0000000