X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/2e4340766e792d93f2ce0a86f5c8d8042bbee789..0c2841349b083b5bf549c2d1f1b44514a79b5a38:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 9b7375e45..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,5 +176,8 @@ module vc_Mux2 #( parameter W = 1 )
 endmodule
 """]]
 
+#<asd>
 
 This is simple enough for now [[sandbocen]] no?
+
+    Do code tags work?