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 a2e56b34d1b249518ad7c729b12342d3b5fd9130..e3b8412dfde15a142260040890e0854800e79713 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,15 @@
+###Is this a heading? 
+
+Sure it is. 
+

 Nope my friend.
 
 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
 [[!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


@@ -35,11 +45,13 @@ testing markdown
 
 - bar
 
 
 - bar
 

-###
+### trois

 
 - blah
     - more blah
 
 
 - blah
     - more blah
 

+#### quatre
+

 ## bir
 - bir
 
 ## bir
 - bir
 


@@ -50,7 +62,7 @@ testing markdown
 ** cyildiz
 
 - tire
 ** cyildiz
 
 - tire

--- ctire
+  - ctire

 
 * *i dene*
 * **b dene**
 
 * *i dene*
 * **b dene**


@@ -201,3 +213,5 @@ Räksmörgås.
 Testing. Test. 試験として書き込みします。
 
 Καλημέρα!
 Testing. Test. 試験として書き込みします。
 
 Καλημέρα!

+
+test