Conflicts: config/assets.yml public/stylesheets/sass/_mixins.scss spec/models/user/posting_spec.rb |
||
|---|---|---|
| .. | ||
| _mixins.scss | ||
| application.sass | ||
| autocomplete.sass | ||
| login.scss | ||
| mobile.sass | ||
| rtl.sass | ||
| sessions.sass | ||
| tags.sass | ||
| ui.sass | ||
Conflicts: config/assets.yml public/stylesheets/sass/_mixins.scss spec/models/user/posting_spec.rb |
||
|---|---|---|
| .. | ||
| _mixins.scss | ||
| application.sass | ||
| autocomplete.sass | ||
| login.scss | ||
| mobile.sass | ||
| rtl.sass | ||
| sessions.sass | ||
| tags.sass | ||
| ui.sass | ||