aboutsummaryrefslogtreecommitdiff
path: root/doc/sandbox.mdwn
diff options
context:
space:
mode:
authorhttp://vn91.ya.ru/ <http://vn91.ya.ru/@web>2012-03-20 03:29:58 -0400
committeradmin <admin@branchable.com>2012-03-20 03:29:58 -0400
commit442f49319bb7d2624aef4dbc2d590c0b54020ba0 (patch)
tree30ba4ab066a300b73c2e9d17a6592aa6b3241aba /doc/sandbox.mdwn
parent4d707e665f0cae47a38da13fd9e78cb705e2f56b (diff)
downloadikiwiki-442f49319bb7d2624aef4dbc2d590c0b54020ba0.tar
ikiwiki-442f49319bb7d2624aef4dbc2d590c0b54020ba0.tar.gz
Diffstat (limited to 'doc/sandbox.mdwn')
-rw-r--r--doc/sandbox.mdwn10
1 files changed, 1 insertions, 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 ]]