X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/a812692a50de69215a8267c7b0b1d7bf62bdfa32..33ebb726e331228366c1e1d789f0eafc639c322e:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 502bc4fec..c9e127223 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 ]]
 
@@ -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