X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b1968dbb24bbf9da41fce0cdaa64aa4495412c7c..5b494e1b636f4c26c14c9cf8f964bef0a70c784a:/doc/sandbox.mdwn?ds=sidebyside

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 47785d0bf..432652d3a 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,16 +1,12 @@
 # Sandbox
 
 [[!pagestats  pages="/tags/*"]]
-<<<<<<< HEAD
-ttt
-[[!sidebar  content="dfdsfsf""
-This is my custom sidebar for this page.
 
-\[[!calendar pages="posts/*"]]
-"""]]
+Hello, ikiwiki.
 
 [[!sidebar ]]
 
+
 ## number 2
 ### number 3
 
@@ -19,6 +15,8 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki
 
 [[!toc levels=1 startlevel=2 ]]
 
+See, online editing :-p
+
 Let's try this~!
 
 w00t, how does this look on the **git** end? Well, as a commit of course.
@@ -181,3 +179,7 @@ endmodule
 This is simple enough for now [[sandbocen]] no?
 
     Do code tags work?
+
+test by max
+
+test by bbb