From: www-data <www-data@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sun, 19 Mar 2006 20:17:20 +0000 (+0000)
Subject: web commit by joey: conflict test
X-Git-Tag: 1.0~319
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=72f0753c30e030aabf64ee597855139105ba5995

web commit by joey: conflict test
---

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