X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5acada2f2576c10f2726396031f7fe8ed3e5fba3..d55be02db0befe5045883309603d3badf4600efc:/doc/sandbox.mdwn?ds=sidebyside

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index d0e64dfe5..bd7ec789f 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,16 +1,8 @@
 # Sandbox
 
 [[!pagestats  pages="/tags/*"]]
-<<<<<<< HEAD
-ttt
-[[!sidebar  content="dfdsfsf""
-This is my custom sidebar for this page.
-
-\[[!calendar pages="posts/*"]]
-"""]]
 
-
-asdfasdf asdfasldkfj asdf
+Hello, ikiwiki.
 
 [[!sidebar ]]
 
@@ -18,7 +10,7 @@ asdfasdf asdfasldkfj asdf
 ## number 2
 ### number 3
 
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki
+This is the SandBox, a page anyone can edit to try out ikiwiki
 (version [[!version  ]]).
 
 [[!toc levels=1 startlevel=2 ]]
@@ -31,6 +23,8 @@ w00t, how does this look on the **git** end? Well, as a commit of course.
 
 Testing this sandbox thing.
 
+Awesome :P
+
 ## Blockquotes
 
 > This is a blockquote.
@@ -190,4 +184,4 @@ This is simple enough for now [[sandbocen]] no?
 
 test by max
 
-Quite nice!
+test by bbb