X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f62d93d85cc4a8cc825dec8c5ba6f322ad37625a..2805999a031556602d3fcf8cf38426b613c36842:/doc/sandbox.mdwn
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 1d54f96ee..47785d0bf 100644
--- 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.
@@ -116,6 +117,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,7 +176,8 @@ module vc_Mux2 #( parameter W = 1 )
endmodule
"""]]
-
-
+#
This is simple enough for now [[sandbocen]] no?
+
+ Do code tags work?