(no commit message)

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

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

-
+<<<<<<< HEAD
+ttt

 [[!sidebar  content="dfdsfsf""
 This is my custom sidebar for this page.
 
 [[!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
 
 
     $ 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.
 
 
 Now let's write the same block, with a bullest list preceding it.
 
 


@@ -168,7 +176,8 @@ module vc_Mux2 #( parameter W = 1 )
 endmodule
 """]]
 
 endmodule
 """]]
 

-<code><asd></code>
-        <asd>
+#<asd>

 
 This is simple enough for now [[sandbocen]] no?
 
 This is simple enough for now [[sandbocen]] no?

+
+    Do code tags work?