X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/be60d261e6cbee094e4df74e1bb24c8ad3dc393d..1c195b4fa71fc07fe129891109c05e080e6d082d:/doc/sandbox.mdwn?ds=inline
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1c..3536e327d 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,44 +1,46 @@
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]).
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki
+(version [[!version ]]).
-<<<<<<< HEAD
-Test conflict.
-=======
-Testing 123.
->>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
-
-# Header
-
-## Subheader2
+hello world
> 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.
+>
+> added a line in level 1
+> and another
+
Numbered list
1. First item.
- 1. Sub item.
+ 1. Sub item.
+ 1. Number 2
1. Another.
1. And another..
- 1. foo
- 2. bar
+ 1. foo
+ 2. bar
+ 3. quz
Bulleted list
* item
-* *item*
+* *italic item*
* item
* one
* footballs; runner; unices
* Cool !
+test _this_ out.
+
+`test this code block`
----
@@ -54,7 +56,27 @@ 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_
+
+test ms
+opopopo
----
This **SandBox** is also a [[blog]]!