web commit by joey: conflict test

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 963c810b25a05bfdf3b4a300e20f01862c61db43..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. test 2...
+Here's a paragraph. test 2: testing 1.2.3.4..
 
 Here's another one with *emphasised* text.