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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index e3b8412df..7a755ee02 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,11 +4,16 @@ Sure it is.
 
 Nope my friend.
 
-<<<<<<< HEAD
-[[test link]]
-=======
-[[Test link]]
->>>>>>> 59f04c5ad3daf0c01e81d28ec1106e23567a1100
+List:
+
+* thing 1
+* thing 2 [[test page space allowed]]
+* thing 3
+* * sublist a? [[TestPage]]
+* * sublist b [[testpage]]
+* thing 4
+
+
 
 [[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]
 
@@ -74,11 +79,11 @@ testing markdown
     b. bar
 
 | table | here |
-|----|.----.|
+|----| ---- |
 | test adfasdfasdfa | 2 |
 | subtest | adfad|
 
-ok no formating.
+Sort of formatted.. No borders, though.
 
 
 > This is a blockquote.
@@ -211,7 +216,13 @@ RÃ¤ksmÃ¶rgÃ¥s.
 `pre?`
 
 Testing. Test. è©¦é¨ã¨ãã¦æ¸ãè¾¼ã¿ãã¾ãã
+âð¢ðð©ð©ð¶ ð ð¬ð¬ð© ð£ð¬ð«ð±, ðªðð«. 
+ðð ð¥ððð¥'ð¤ ð¨ððð¥ ðªð ð¦'ð£ð ððð¥ð ,
+ðð®ð»ð¼ð¸ð·ðªðµðµð, ð ðµð²ð´ð® ðª ð«ð²ð½ ð¸ð¯ ð¼ð½ððµð®. ðð·ð­ ð¬ðµðªð¼ð¼.
+ð­ðð ð´ ððð'ð ðððð ð ððð ððððð ðð.
 
 ÎÎ±Î»Î·Î¼Î­ÏÎ±!
 
 test
+
+I must **emphasise** this.