create a theme market

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 6d589e33bf01b8749daee9a7b7787a3caa340f0a..9e4994415cbe42f503c547bb3e0e14c19a9663f0 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,6 +1,7 @@
 # Sandbox
 
 [[!pagestats  pages="/tags/*"]]
+<<<<<<< HEAD
 ttt
 [[!sidebar  content="dfdsfsf""
 This is my custom sidebar for this page.
@@ -10,6 +11,7 @@ This is my custom sidebar for this page.
 
 [[!sidebar ]]
 
+
 ## number 2
 ### number 3
 
@@ -18,6 +20,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.