X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=doc%2Fsandbox.mdwn;h=365cb3321c17a107fbba29da998730a15078ef74;hp=4c8621f1cad4ca58cba6de91ce90898478a0fb8b;hb=6d213a0c739d5b34357b01a616f99197eeba6ad9;hpb=1786b106a9c7f448136ff47d9b6dd26d48a5dd2e
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1c..365cb3321 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,20 +1,10 @@
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 the first level of quoting.
>
-> > This is nested blockquote.
+> > This is a nested blockquote.
>
>> Without a space works too.
>>> to three levels
@@ -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
@@ -54,9 +46,13 @@ Bulleted list
* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
*
* [GNU](http://www.gnu.org/)
+*
+
+
----
This **SandBox** is also a [[blog]]!
+[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]]
[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]