X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/64825362ad925990b979cb2813539cca9fb8eb70..7f8706dfdb35e28bf81857dba01541c2958f62a6:/doc/sandbox.mdwn?ds=inline

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