X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ad5bcc5391f990e7284633f2c9ce3e7b4571004f..a241942f17b8ffbc0d4f3251aad00708271b8344:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 502bc4fec..8dcd648be 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,16 +1,10 @@
 # Sandbox
 
 [[!pagestats  pages="/tags/*"]]
-<<<<<<< HEAD
-ttt
-[[!sidebar  content="dfdsfsf""
-This is my custom sidebar for this page.
-
-\[[!calendar pages="posts/*"]]
-"""]]
 
+Hello, ikiwiki.
 
-asdfasdf asdfasldkfj asdf
+Testing.
 
 [[!sidebar ]]
 
@@ -18,7 +12,7 @@ asdfasdf asdfasldkfj asdf
 ## number 2
 ### number 3
 
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki
+This is the SandBox, a page anyone can edit to try out ikiwiki
 (version [[!version  ]]).
 
 [[!toc levels=1 startlevel=2 ]]
@@ -31,6 +25,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 +185,8 @@ This is simple enough for now [[sandbocen]] no?
     Do code tags work?
 
 test by max
+
+test by bbb
+
+
+Can I make a [[NewPage]]?