diff options
| -rw-r--r-- | doc/sandbox.mdwn | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 0872462f6..a9065ffc9 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"]] |