From 5cf4336f5bfcdb3cd0b99907f8af7348146962ed Mon Sep 17 00:00:00 2001
From: einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>
Date: Thu, 17 May 2007 15:25:20 +0000
Subject: Resolving conflict in CONTRIPBUTORS

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@1203 4979c152-3d1c-0410-bac9-87ea11338e46
---
 CONTRIBUTORS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 063fa461..0cf05b93 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -57,6 +57,9 @@ Jeff Kowalczyk [email omitted] contributed to the INSTALL documentation.
 Matt S Trout, <mst @ shadowcatsystems.co.uk> CPAN: MSTROUT, 
 IRC: mst#irc.perl.org contributed the initial Makefile.PL
 
+David Bandel <david.bandel @ gmail.com> contributed some fixes to the UPGRADE 
+documentation.
+
 Ashley Gittins contributed <agittins @ purple.dropbear.id.au> has contributed 
 some performance fixes and has contributed a great deal of work to our web site.
 
-- 
cgit v1.2.3