can just be wrapped in HTML

[ikiwiki.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 502bc4feca5d4d46a41452feb4eef70d4d973085..c9e127223bb31137cf0d3abad7f2f94d7f39d12a 100644 (file)
--- 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 ]]
 
@@ -31,6 +23,8 @@ w00t, how does this look on the **git** end? Well, as a commit of course.
 
 Testing this sandbox thing.
 
+Awesome :P
+
 ## Blockquotes
 
 > This is a blockquote.
@@ -189,3 +183,5 @@ This is simple enough for now [[sandbocen]] no?
     Do code tags work?
 
 test by max
+
+test by bbb