X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/698386604a4cfa90a89595cfd3164b60046de474..6e68a48b63a532369d97709dd189d233c5fd0298:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index afd7dbeab..4c8621f1c 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,9 +1,14 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
+<<<<<<< HEAD
+Test conflict.
+=======
+Testing 123.
+>>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
 
 # Header
 
-## Subheader
+## Subheader2
 
 > This is a blockquote.
 >
@@ -32,6 +37,8 @@ Bulleted list
 * item
 * one
   * footballs; runner; unices
+  * Cool !
+
 
 ----
 
@@ -48,32 +55,8 @@ Bulleted list
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 
------
-
-[[!progress percent=27]]
-
-[[!progress percent=78]]
-
------
+----
 
 This **SandBox** is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
-
-----
-
-What about [relative urls](../setup/byhand)?
-
-[[!toggleable  id="foobar" text="""
-foo
-"""]]
-
-[[!toggleable  id="foobar" text="""
-bar
-"""]]
-
-[[!toggle  id="foobar" text="foo/bar"]]
-
-Hmm, can I dig it?
-
-Test