X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/64825362ad925990b979cb2813539cca9fb8eb70..efe05d18ae5633d7a186d2cb97377b6e08ea8f4e:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 9e4994415..8dcd648be 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,13 +1,10 @@
 # Sandbox
 
 [[!pagestats  pages="/tags/*"]]
-<<<<<<< HEAD
-ttt
-[[!sidebar  content="dfdsfsf""
-This is my custom sidebar for this page.
 
-\[[!calendar pages="posts/*"]]
-"""]]
+Hello, ikiwiki.
+
+Testing.
 
 [[!sidebar ]]
 
@@ -15,7 +12,7 @@ This is my custom sidebar for this page.
 ## 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 ]]
@@ -28,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.
@@ -184,3 +183,10 @@ endmodule
 This is simple enough for now [[sandbocen]] no?
 
     Do code tags work?
+
+test by max
+
+test by bbb
+
+
+Can I make a [[NewPage]]?