From: Gary Macbook <gsteele13@gmail.com>
Date: Thu, 19 Nov 2015 13:02:35 +0000 (+0100)
Subject: Revert "user2's changes"
X-Git-Url: https://nsweb.tn.tudelft.nl/gitweb/?a=commitdiff_plain;h=1ec503c1f981856033d30b3126c2666aa7442e11;p=test.git

Revert "user2's changes"

Now I'm not sure what is going on

This reverts commit b3a8796f786699d7ee19db40b59e99ef935546d8.

Conflicts:
	test1.txt
---

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