resolved user.rb conflict
[rails.git] / public / img /
2006-08-27 Steve Coastopenlayers madness