Conflicts: app/controllers/managements_controller.rb config/routes.rb |
||
|---|---|---|
| .. | ||
| _content_list.html.erb | ||
| _form.html.erb | ||
| edit.html.erb | ||
| index.html.erb | ||
| index_down.js.erb | ||
| index_up.js.erb | ||
| new.html.erb | ||
| show.html.erb | ||
Conflicts: app/controllers/managements_controller.rb config/routes.rb |
||
|---|---|---|
| .. | ||
| _content_list.html.erb | ||
| _form.html.erb | ||
| edit.html.erb | ||
| index.html.erb | ||
| index_down.js.erb | ||
| index_up.js.erb | ||
| new.html.erb | ||
| show.html.erb | ||