testing

[ikiwiki.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 888da3ea65431785559a6cb1f287611b3954f5a5..d6e44cbe21c0f359b911c15392fbc967b8e0eb6e 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,7 +1,8 @@
 # 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.
@@ -116,6 +120,13 @@ Now we try to write a "code" block starting with a hash sign
     $ another test
 
 
+Oh, let's try to do the same thing using sane syntax instead:
+
+~~~
+# test 1,2,3
+$ another test
+~~~
+
 Now let's write the same block, with a bullest list preceding it.
 
 
@@ -168,6 +179,10 @@ module vc_Mux2 #( parameter W = 1 )
 endmodule
 """]]
 
-< abc>
+#<asd>
 
 This is simple enough for now [[sandbocen]] no?
+
+    Do code tags work?
+
+test by max