From: http://vn91.ya.ru/ <http://vn91.ya.ru/@web>
Date: Tue, 20 Mar 2012 07:29:58 +0000 (-0400)
Subject: (no commit message)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=442f49319bb7d2624aef4dbc2d590c0b54020ba0;p=ikiwiki.git

---

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 ]]