Untested backport to Ubuntu trusty.

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c39ce8c72ce198dfc5a6f66c884d94e88cbeb31..038412d14b09156f2cee05e93ce4b3600587c3ad 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,10 @@
-[[!template  id=test45 text="""Here is the text to insert into my note."""]]
-dddddddddddd
+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"]]
 
@@ -8,6 +13,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)
@@ -34,11 +41,29 @@ testing markdown
 
 - bar
 
-###
+### trois
 
 - blah
     - more blah
 
+#### quatre
+
+## bir
+- bir
+
+## iki
+- iki
+
+* yildiz
+** cyildiz
+
+- tire
+  - ctire
+
+* *i dene*
+* **b dene**
+
+
 1. number
 2. list
     a. ick