From: Nick Black <nickb@svn.openstreetmap.org>
Date: Sat, 5 May 2007 14:24:08 +0000 (+0000)
Subject: resolved user.rb conflict
X-Git-Tag: live~9345
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/7bcda2794f144dc2f1715a290a03df79c4010db8?hp=7bcda2794f144dc2f1715a290a03df79c4010db8

resolved user.rb conflict
---