X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6e68a48b63a532369d97709dd189d233c5fd0298..c0fa166f1939d7eb88eff2fe15a4548af2759fe4:/doc/sandbox.mdwn?ds=inline
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1c..307fec8ad 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,20 +1,18 @@
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]).
+# Sandbox
-<<<<<<< HEAD
-Test conflict.
-=======
-Testing 123.
->>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki
+(version [[!version ]]).
-# Header
+[[!toc levels=1 startlevel=2 ]]
-## Subheader2
+
+## Blockquotes
> 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
@@ -29,6 +27,7 @@ Numbered list
1. And another..
1. foo
2. bar
+ 3. quz
Bulleted list
@@ -54,6 +53,23 @@ Bulleted list
* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
*
* [GNU](http://www.gnu.org/)
+* Joey's blog
+
+----
+
+# header1
+
+## header2
+
+### header3
+
+#### header4
+
+##### header 5
+
+**bold**
+
+_italic_
----