X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2e3f3ae89cfe66eb6be78003165cca1aff17ecb8..a6e629e5cf612e3c32c61c3fc0a9d859c1a7a5d9:/doc/sandbox.mdwn diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index cc2569e7c..4c8621f1c 100644 --- 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. @@ -55,36 +55,8 @@ Bulleted list * * [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? -