]> git.openstreetmap.org Git - osqa.git/commitdiff
resolving conflict in the email settings file
authorjordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Wed, 16 Mar 2011 00:27:31 +0000 (00:27 +0000)
committerjordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Wed, 16 Mar 2011 00:27:31 +0000 (00:27 +0000)
git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@852 0cfe37f9-358a-4d5e-be75-b63607b5c754


No differences found