aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorkw_ikiwiki1@64633d204c198f52735247ca119bddbcbfaafdef <kw_ikiwiki1@web>2017-03-07 09:59:48 -0400
committeradmin <admin@branchable.com>2017-03-07 09:59:48 -0400
commit888b4603e1b71d228ca82893c15b34676d325ff1 (patch)
tree02a1ca1602bd3ed077689252680bdb6becb7bb71 /doc
parent6b75169007888c95829b4ad1209a5390f1bedf8f (diff)
downloadikiwiki-888b4603e1b71d228ca82893c15b34676d325ff1.tar
ikiwiki-888b4603e1b71d228ca82893c15b34676d325ff1.tar.gz
test test blah blah
Diffstat (limited to 'doc')
-rw-r--r--doc/sandbox.mdwn15
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"]]