resolved user.rb conflict
authorNick Black <nickb@svn.openstreetmap.org>
Sat, 5 May 2007 14:24:08 +0000 (14:24 +0000)
committerNick Black <nickb@svn.openstreetmap.org>
Sat, 5 May 2007 14:24:08 +0000 (14:24 +0000)
commit7bcda2794f144dc2f1715a290a03df79c4010db8
treebaeb2ba6917fe666d9ef5f0a5d0dd739181b2ee2
parentbfdef8dc68265d772ddbf514c09ecfa2c6eee92c
resolved user.rb conflict
app/controllers/user_controller.rb
app/models/user.rb
config/routes.rb
db/migrate.sql