Conflicts: app/controllers/admin/ad_banners_controller.rb app/controllers/admin/ad_images_controller.rb lib/ad_banner/engine.rb |
||
|---|---|---|
| .. | ||
| ad_banners | ||
| admin | ||
| .keep | ||
Conflicts: app/controllers/admin/ad_banners_controller.rb app/controllers/admin/ad_images_controller.rb lib/ad_banner/engine.rb |
||
|---|---|---|
| .. | ||
| ad_banners | ||
| admin | ||
| .keep | ||