From 442f49319bb7d2624aef4dbc2d590c0b54020ba0 Mon Sep 17 00:00:00 2001 From: "http://vn91.ya.ru/" Date: Tue, 20 Mar 2012 03:29:58 -0400 Subject: [PATCH] --- doc/sandbox.mdwn | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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 ]] -- 2.32.0.93.g670b81a890