Merge branch 'master' of ssh://git.ikiwiki.info

[git.ikiwiki.info.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 47785d0bf710cadfeaf69520f43c319626e37017..ed1568f8241c165f1e5ed993da9b7e9b728d049d 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,16 +1,12 @@
 # Sandbox
 
 [[!pagestats  pages="/tags/*"]]
 # Sandbox
 
 [[!pagestats  pages="/tags/*"]]

-<<<<<<< HEAD
-ttt
-[[!sidebar  content="dfdsfsf""
-This is my custom sidebar for this page.

 
 

-\[[!calendar pages="posts/*"]]
-"""]]
+Hello, ikiwiki.

 
 [[!sidebar ]]
 
 
 [[!sidebar ]]
 

+

 ## number 2
 ### number 3
 
 ## 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 ]]
 
 
 [[!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.
 Let's try this~!
 
 w00t, how does this look on the **git** end? Well, as a commit of course.


@@ -181,3 +179,5 @@ endmodule
 This is simple enough for now [[sandbocen]] no?
 
     Do code tags work?
 This is simple enough for now [[sandbocen]] no?
 
     Do code tags work?

+
+test by max