From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Mon, 16 Apr 2007 20:04:01 +0000 (+0000)
Subject: web commit by http://nicholas.allen.myopenid.com/
X-Git-Tag: 1.51~149
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e100bc5d194cecda54895db452379a099e2b4f5e;p=ikiwiki.git

web commit by http://nicholas.allen.myopenid.com/
---

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index dee1b054e..af357f4dc 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -108,3 +108,6 @@ Test.. I was looking for a wiki supporting OpenID~
 
 ----
 me too...
+
+
+This is a test for conflict2
\ No newline at end of file