X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/befcb09e8f7e4dbd04f8829e0abd48f8bc74bc5f..06fbc6297dd7e7092aa33f2ff94eff942b84236d:/doc/sandbox.mdwn?ds=inline

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b3eb52f07..e3b8412df 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,6 +1,14 @@
+###Is this a heading? 
+
+Sure it is. 
+
 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"]]
 
@@ -205,3 +213,5 @@ Räksmörgås.
 Testing. Test. 試験として書き込みします。
 
 Καλημέρα!
+
+test