From: www-data <www-data@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sun, 19 Mar 2006 20:34:10 +0000 (+0000)
Subject: web commit by joey: conflict test
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/4d50e71d3117b515bf53cc4af8da6dbf75dcaca8?ds=sidebyside

web commit by joey: conflict test
---

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 963c810b2..36c755650 100644
--- 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.