web commit by joey: conflict test

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index cc37a9978e18cd0e4e1029523a003486a00ddf2c..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. This is a conflict test edit.......
+Here's a paragraph. test 2...
 
 Here's another one with *emphasised* text.