committing changes for conflict test

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 7a47a34e30635814ff639577b633a998d1339285..83e9a77fe5bb592ebd0cd478d914d4a5c266290a 100644 (file)
--- 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.
 
 
 Here's another one with *emphasised* text.
 


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

+* hi mom!

 
 [[WikiLink]]
 
 
 [[WikiLink]]