From e100bc5d194cecda54895db452379a099e2b4f5e Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Mon, 16 Apr 2007 20:04:01 +0000
Subject: web commit by http://nicholas.allen.myopenid.com/

---
 doc/sandbox.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

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
-- 
cgit v1.2.3