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

web commit by joey: conflict test
---

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 83e9a77fe..cc37a9978 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,8 +4,7 @@ See [[MarkDown]] for documentation of the markup syntax used on this page.
 
 ----
 
-Here's a paragraph. This is a confict test; I'm also editing this line on
-the web.
+Here's a paragraph. This is a conflict test edit.......
 
 Here's another one with *emphasised* text.
 
@@ -34,7 +33,6 @@ Bulleted list
 * item
 * just to try this stuff - looks kool!
 * test
-* hi mom!
 
 [[WikiLink]]