resolved user.rb conflict
[rails.git] / public / 404.html
2006-07-28 Steve Coastbeginning of osm on rails