(no commit message)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 502bc4feca5d4d46a41452feb4eef70d4d973085..ed1568f8241c165f1e5ed993da9b7e9b728d049d 100644 (file)
--- 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 ]]