resolved user.rb conflict
[rails.git] / public / stylesheets /
drwxr-xr-x   ..
-rw-r--r-- 6652 site.css