X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6e68a48b63a532369d97709dd189d233c5fd0298..2d24281a3abcff8f122a5899c7dee4db29acb00a:/doc/sandbox.mdwn?ds=inline

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1c..32957f86c 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,16 +1,6 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-<<<<<<< HEAD
-Test conflict.
-=======
-Testing 123.
->>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
-
-# Header
-
-## Subheader2
-
-> This is a blockquote.
+> This is a blockerquote.
 >
 > This is the first level of quoting.
 >
@@ -29,6 +19,7 @@ Numbered list
 1. And another..
  1. foo
  2. bar
+ 3. quz
 
 Bulleted list