aboutsummaryrefslogtreecommitdiff
path: root/doc/sandbox.mdwn
diff options
context:
space:
mode:
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 ]]