X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/64825362ad925990b979cb2813539cca9fb8eb70..d08b2bb511c67a118765045ab00574907d530bb7:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 9e4994415..ed1568f82 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 ]]
 
@@ -184,3 +179,5 @@ endmodule
 This is simple enough for now [[sandbocen]] no?
 
     Do code tags work?
+
+test by max