From: Caspar Safarlou <safarlou@live.nl>
Date: Wed, 12 Nov 2014 09:18:23 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/dopefishh/kvltpr0lvg
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=a3f1b6042a3f1e2ebc8afaf838ee6a6742b046ca;p=ker1415-1.git

Merge branch 'master' of https://github.com/dopefishh/kvltpr0lvg

Conflicts:
	caspartest
---

a3f1b6042a3f1e2ebc8afaf838ee6a6742b046ca
diff --cc caspartest~
index 0000000,0000000..2024b2d
new file mode 100644
--- /dev/null
+++ b/caspartest~
@@@ -1,0 -1,0 +1,5 @@@
++<<<<<<< HEAD
++hallo dit is raar
++=======
++hoi neger
++>>>>>>> 066f320c3074b4208de85c8b555c4c7408452b4f