web commit by joey: conflict test

[ikiwiki.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index e25d2e3159a9b1eb2e00bce274d6fbfdec342bfe..36c755650f26d79a8a97e2fe02bbe38447dbfa1b 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: testing 1.2.3.4..
 
 Here's another one with *emphasised* text.
 
@@ -28,10 +28,12 @@ Numbered list
 
 Bulleted list
 
-* item
+* *item*
 * item
 * item
 * just to try this stuff - looks kool!
-* just another commit (: no preview?
+* test
 
 [[WikiLink]]
+
+[[SandBox/SubPage]] -- a page under this one.