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

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

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