Merge branch 'master' into debian-jessie-backports

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index d3b348636e194d23ed477753032d232ed2f4e554..d7f866c769ae961ee91a913cb264658580993946 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,15 @@
+###Is this a heading? 
+
+Sure it is. 
+
 Nope my friend.
 
+<<<<<<< HEAD
+[[test link]]
+=======
+[[Test link]]
+>>>>>>> 59f04c5ad3daf0c01e81d28ec1106e23567a1100
+
 [[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]
 
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki
@@ -7,6 +17,8 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki
 vvvv
 CamelCase ?
 
+[[!tag sandbox]]
+
 What about [[this page]], nono better [[that page]]?
 
 hello world (right back at ya)
@@ -33,11 +45,13 @@ testing markdown
 
 - bar
 
-###
+### trois
 
 - blah
     - more blah
 
+#### quatre
+
 ## bir
 - bir
 
@@ -48,7 +62,7 @@ testing markdown
 ** cyildiz
 
 - tire
--- ctire
+  - ctire
 
 * *i dene*
 * **b dene**