X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4d707e665f0cae47a38da13fd9e78cb705e2f56b..442f49319bb7d2624aef4dbc2d590c0b54020ba0:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 502bc4fec..ed1568f82 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 ]]