From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Wed, 16 Mar 2011 00:27:31 +0000 (+0000)
Subject: resolving conflict in the email settings file
X-Git-Tag: live~415
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/fb252f100da6c6003a3db099e3ddc1a4a177fa1b

resolving conflict in the email settings file

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@852 0cfe37f9-358a-4d5e-be75-b63607b5c754
---