po todo update: this has been fixed already.

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1cad4ca58cba6de91ce90898478a0fb8b..691f20ffe782f010823455a2eba0ce0b739e679e 100644 (file)
--- 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.
 >
@@ -25,10 +15,12 @@ Numbered list
 
 1. First item.
  1. Sub item.
+ 2. bar
 1. Another.
 1. And another..
  1. foo
  2. bar
+ 3. quz
 
 Bulleted list