remove conflict data

2018-03-05 16:24:45 +06:30
parent 4b311789e1 311bef4411
commit bd06e80b37
111 changed files with 3612 additions and 1386 deletions
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -8,7 +8,6 @@ class BaseOrigamiController < ActionController::Base
  protect_from_forgery with: :exception

  helper_method :shop_detail
-
  rescue_from CanCan::AccessDenied do |exception|
    flash[:warning] = exception.message
    # redirect_to origami_root_path