2012-03-20 03:29:58 -04:00 · 2012-03-20 03:29:58 -04:00 · 442f49319b
parent 4d707e665f
commit 442f49319b
1 changed files with 1 additions and 9 deletions
--- 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 ]]