From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sun, 19 Mar 2006 20:10:58 +0000 (+0000)
Subject: committing changes for conflict test
X-Git-Tag: 1.0~321
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6dc29ca72a890bb16542ff1e795fea5aa642e420;p=ikiwiki.git

committing changes for conflict test
---

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