Conflicts: app/helpers/pages_helper.rb public/stylesheets/main.css public/stylesheets/print.css |
||
|---|---|---|
| .. | ||
| sass | ||
| foodsoft.css | ||
| ie_hacks.css | ||
| main.css | ||
| nav.css | ||
| print.css | ||
| rails_messages.css | ||
| scaffold.css | ||
Conflicts: app/helpers/pages_helper.rb public/stylesheets/main.css public/stylesheets/print.css |
||
|---|---|---|
| .. | ||
| sass | ||
| foodsoft.css | ||
| ie_hacks.css | ||
| main.css | ||
| nav.css | ||
| print.css | ||
| rails_messages.css | ||
| scaffold.css | ||