From: Gary Macbook <gsteele13@gmail.com>
Date: Thu, 19 Nov 2015 09:29:08 +0000 (+0100)
Subject: Overriding the changes that user 1 made
X-Git-Url: https://nsweb.tn.tudelft.nl/gitweb/?a=commitdiff_plain;h=23389b0256388e51d702d47d89397618d386ee15;p=test.git

Overriding the changes that user 1 made

Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test

Conflicts:
	test1.txt
---

23389b0256388e51d702d47d89397618d386ee15