X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2ee121fca45c95824ff36ef2cb1091fc34d1fefb..6dc29ca72a890bb16542ff1e795fea5aa642e420:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 99bd5e964..83e9a77fe 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,7 +4,8 @@ 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 *emphasised* text.
 
@@ -32,8 +33,8 @@ Bulleted list
 * item
 * item
 * just to try this stuff - looks kool!
-* just another commit (: no preview?
-* hi mom
+* test
+* hi mom!
 
 [[WikiLink]]