committing changes for conflict test

[git.ikiwiki.info.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 03ae1f1c03fd2f4ef8fbb90b9e29be27bc32632b..83e9a77fe5bb592ebd0cd478d914d4a5c266290a 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,9 +4,10 @@ See [[MarkDown]] for documentation of the markup syntax used on this page.
 
 ----
 
-Here's a paragraph.
+Here's a paragraph. This is a confict test; I'm also editing this line on
+the web.
 
-Here's another one with _emphasized_ and *bold* text.
+Here's another one with *emphasised* text.
 
 # Header
 
@@ -28,8 +29,13 @@ Numbered list
 
 Bulleted list
 
+* *item*
 * item
 * item
-* item
+* just to try this stuff - looks kool!
+* test
+* hi mom!
 
 [[WikiLink]]
+
+[[SandBox/SubPage]] -- a page under this one.