web commit by joey: conflict test

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

-Here's a paragraph. This is a confict test; I'm also editing this line on
-the web.
+Here's a paragraph. This is a conflict test edit.......

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


@@ -34,7 +33,6 @@ Bulleted list
 * item
 * just to try this stuff - looks kool!
 * test
 * item
 * just to try this stuff - looks kool!
 * test

-* hi mom!

 
 [[WikiLink]]
 
 
 [[WikiLink]]