X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1d4ddbb9eb140b9bafe5091143473a52e03887c5..766311f45b4351488d7dad519a6471094a58da16:/doc/sandbox.mdwn?ds=sidebyside

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index a2e56b34d..038412d14 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,11 @@
 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"]]
 
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki
@@ -35,11 +41,13 @@ testing markdown
 
 - bar
 
-###
+### trois
 
 - blah
     - more blah
 
+#### quatre
+
 ## bir
 - bir
 
@@ -50,7 +58,7 @@ testing markdown
 ** cyildiz
 
 - tire
--- ctire
+  - ctire
 
 * *i dene*
 * **b dene**