# Conflicts: # assets/styles/root/050_ruby_controls.css # layouts/partials/ruby_controls.html |
||
|---|---|---|
| .. | ||
| baseof.html | ||
| category.html | ||
| rss_item.rss | ||
| single.html | ||
| single.json | ||
| term.html | ||
| terms.html | ||
# Conflicts: # assets/styles/root/050_ruby_controls.css # layouts/partials/ruby_controls.html |
||
|---|---|---|
| .. | ||
| baseof.html | ||
| category.html | ||
| rss_item.rss | ||
| single.html | ||
| single.json | ||
| term.html | ||
| terms.html | ||