fixed conflict after merge with dev

2019-11-28 16:47:12 +06:30
parent 858ddfd93b 2010b6a4bb
commit d41d957688
37 changed files with 295 additions and 430 deletions
--- a/app/controllers/settings/payment_method_settings_controller.rb
+++ b/app/controllers/settings/payment_method_settings_controller.rb
@@ -41,7 +41,6 @@ class Settings::PaymentMethodSettingsController < ApplicationController
  # PATCH/PUT /settings/payment_method_settings/1
  # PATCH/PUT /settings/payment_method_settings/1.json
  def update
-    puts settings_payment_method_setting_params
    respond_to do |format|
      if @settings_payment_method_setting.update(settings_payment_method_setting_params)
        format.html { redirect_to settings_payment_method_setting_path(@settings_payment_method_setting), notice: 'Payment method setting was successfully updated.' }