From: freij <freij@web>
Date: Sun, 13 Mar 2016 19:36:13 +0000 (-0400)
Subject: (no commit message)
X-Git-Tag: 3.20160506~47
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/40dbcaebf29fc62f07f1452dd2588baf6287fc76?hp=befcb09e8f7e4dbd04f8829e0abd48f8bc74bc5f

---

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b3eb52f07..038412d14 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,6 +1,10 @@
 Nope my friend.
 
+<<<<<<< HEAD
 [[test link]]
+=======
+[[Test link]]
+>>>>>>> 59f04c5ad3daf0c01e81d28ec1106e23567a1100
 
 [[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]