X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6e68a48b63a532369d97709dd189d233c5fd0298..96d41dd21641c7a2683bdd0671bcd36dab7c069c:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1c..7a10c8403 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,26 +1,24 @@
-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 the [[SandBox]], a page anyone can edit to try out ikiwiki
+(version [[!version  ]]).
 
 > This is a blockquote.
 >
 > This is the first level of quoting.
 >
-> > This is nested blockquote.
+> > This is a nested blockquote.
 >
 >> Without a space works too.
 >>> to three levels
 >
 > Back to the first level.
 
+1. Hot Items
+ 1. Daves Insanity Sauce
+ 2. Marie Sharps 
+ 1. Blazing Inferno
+1. Not so Hot Items
+ 1. Tabasco 
+
 Numbered list 
 
 1. First item.
@@ -29,6 +27,7 @@ Numbered list
 1. And another..
  1. foo
  2. bar
+ 3. quz
 
 Bulleted list