(no commit message)

[ikiwiki.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index d6e44cbe21c0f359b911c15392fbc967b8e0eb6e..ed1568f8241c165f1e5ed993da9b7e9b728d049d 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,13 +1,8 @@
 # Sandbox
 
 [[!pagestats  pages="/tags/*"]]
-<<<<<<< HEAD
-ttt
-[[!sidebar  content="dfdsfsf""
-This is my custom sidebar for this page.
 
-\[[!calendar pages="posts/*"]]
-"""]]
+Hello, ikiwiki.
 
 [[!sidebar ]]