X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f146bd0cf8f8fb661fe8690cd3246aa6ba6225f4..a6e629e5cf612e3c32c61c3fc0a9d859c1a7a5d9:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 1f842d499..4c8621f1c 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,14 +1,14 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-Here's a paragraph.
-
-Here's another one with *emphasised* text.
-
-test 2
+<<<<<<< HEAD
+Test conflict.
+=======
+Testing 123.
+>>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
 
 # Header
 
-## Subheader
+## Subheader2
 
 > This is a blockquote.
 >
@@ -36,7 +36,9 @@ Bulleted list
 * *item*
 * item
 * one
-  * two
+  * footballs; runner; unices
+  * Cool !
+
 
 ----
 
@@ -44,16 +46,17 @@ Bulleted list
 [[!haiku hint="sandbox play"]]
 
 ----
-blah
+
 ## Different sorts of links:
 
 * [[Features]]
+* <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 
------
+----
 
-This SandBox is also a [[blog]]!
+This **SandBox** is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]