aboutsummaryrefslogtreecommitdiff
path: root/doc/sandbox.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/sandbox.mdwn')
-rw-r--r--doc/sandbox.mdwn10
1 files changed, 9 insertions, 1 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index c3fb32b30..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.