Conflicts: app/controllers/admin/ad_banners_controller.rb app/controllers/admin/ad_images_controller.rb lib/ad_banner/engine.rb |
||
|---|---|---|
| .. | ||
| _form.html.erb | ||
| edit.html.erb | ||
| index.html.erb | ||
| new.html.erb | ||
Conflicts: app/controllers/admin/ad_banners_controller.rb app/controllers/admin/ad_images_controller.rb lib/ad_banner/engine.rb |
||
|---|---|---|
| .. | ||
| _form.html.erb | ||
| edit.html.erb | ||
| index.html.erb | ||
| new.html.erb | ||