merged

[git.ikiwiki.info.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b8bcc62c403373354d448997593aff44567a1662..32957f86c6c556e63942502a7581da36ed504104 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,12 +1,6 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-Test conflict.
-
-# Header
-
-## Subheader2
-
-> This is a blockquote.
+> This is a blockerquote.
 >
 > This is the first level of quoting.
 >
@@ -25,6 +19,7 @@ Numbered list
 1. And another..
  1. foo
  2. bar
+ 3. quz
 
 Bulleted list