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