X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5736fae84648eaf4ddb3e06527550df994dab645..33b39968948f2dcda5c073916d797259e441d1de:/doc/sandbox.mdwn diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index a2e56b34d..0872462f6 100644 --- 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 @@ -35,11 +45,13 @@ testing markdown - bar -### +### trois - blah - more blah +#### quatre + ## bir - bir @@ -50,7 +62,7 @@ testing markdown ** cyildiz - tire --- ctire + - ctire * *i dene* * **b dene** @@ -201,3 +213,7 @@ Räksmörgås. Testing. Test. 試験として書き込みします。 Καλημέρα! + +test + +I must **emphasise** this.