From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sun, 19 Mar 2006 20:35:59 +0000 (+0000)
Subject: non-conficting commit to test merging..
X-Git-Tag: 1.0~316
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1b4f41de77c39ed6c61afff33d1e4cdf4d33a79b;p=ikiwiki.git

non-conficting commit to test merging..
---

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 36c755650..09f353450 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -33,6 +33,7 @@ Bulleted list
 * item
 * just to try this stuff - looks kool!
 * test
+* hi mom
 
 [[WikiLink]]