(no commit message)

[ikiwiki.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 7c32d0cfed2fa4f0418c03916475c3cd508b8183..4c8621f1cad4ca58cba6de91ce90898478a0fb8b 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,9 +1,11 @@
-[[!sidebar]]
-
-
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-[[Testing 1 2 3| test]]
+<<<<<<< HEAD
+Test conflict.
+=======
+Testing 123.
+>>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
+
 # Header
 
 ## Subheader2
@@ -19,8 +21,6 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v
 >
 > Back to the first level.
 
-"I'm sitting in the middle of a rather muddy puddle."
-
 Numbered list 
 
 1. First item.
@@ -29,7 +29,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
- 3. cool
 
 Bulleted list
 
@@ -56,37 +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
-test2
-
-I assume this triggers a checkin and recompile?
-
-[[!inline pages="/index"]]