web commit by joey: conflict test

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index ae851546e42742c4834e4665bac9579c066b7d78..963c810b25a05bfdf3b4a300e20f01862c61db43 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,7 +4,7 @@ See [[MarkDown]] for documentation of the markup syntax used on this page.
 
 ----
 
 
 ----
 

-Here's a paragraph.
+Here's a paragraph. test 2...

 
 Here's another one with *emphasised* text.
 
 
 Here's another one with *emphasised* text.
 


@@ -28,9 +28,12 @@ Numbered list
 
 Bulleted list
 
 
 Bulleted list
 

-* item
+* *item*

 * item
 * item
 * just to try this stuff - looks kool!
 * item
 * item
 * just to try this stuff - looks kool!

+* test

 
 [[WikiLink]]
 
 [[WikiLink]]

+
+[[SandBox/SubPage]] -- a page under this one.