X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ddb44f16383f24f40419ab1d3afb86e71b29728e..cfc5d5d9ed1a5c76212fecd592639aaa3de9b784:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index e4887bea4..038412d14 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,20 +1,82 @@
+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
 (version [[!version  ]]).
-
+vvvv
 CamelCase ?
 
-What about [[this page]]?
+[[!tag sandbox]]
+
+What about [[this page]], nono better [[that page]]?
 
 hello world (right back at ya)
 
+wait how does versioning work
+
 test, is it being saved? Probably. I will check. This seems really straightforward.
 
+Hello!
+
 ~~~
 pre formated text?
 ~~~
 
+```
+testing markdown
+```
+
+# one
+
+- foo
+
+## two
+
+- bar
+
+### trois
+
+- blah
+    - more blah
+
+#### quatre
+
+## bir
+- bir
+
+## iki
+- iki
+
+* yildiz
+** cyildiz
+
+- tire
+  - ctire
+
+* *i dene*
+* **b dene**
+
+
+1. number
+2. list
+    a. ick
+    b. bar
+
+| table | here |
+|----|.----.|
+| test adfasdfasdfa | 2 |
+| subtest | adfad|
+
+ok no formating.
+
+
 > This is a blockquote.
 >
 > This is the first level of quoting.
@@ -25,6 +87,7 @@ A block of text
 >> Without a space works too.
 >>> to three levels
 
+This is pretty sweet
 
 Azerty
 ** Qsdf **