fixed conflict after merge with dev

app/controllers/settings/commissioners_controller.rb

@@ -37,7 +37,6 @@ class Settings::CommissionersController < ApplicationController
     unless @commissioner.resigned_date.nil?
       @commissioner.resigned_date = @commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d')
     end
-    # puts params[:from_induty].length
     if (params[:from_induty] != "true")
       respond_to do |format|
         if @commissioner.save

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.' }

app/controllers/settings/promotions_controller.rb

@@ -117,8 +117,6 @@ class Settings::PromotionsController < ApplicationController
       end
       res.push({item_inst.menu_item.item_code => arr_inst})
     end
-    puts "res"
-    p res
     render json: res
   end
 

app/controllers/settings/rooms_controller.rb

@@ -35,7 +35,6 @@ class Settings::RoomsController < ApplicationController
         format.html { redirect_to settings_zone_path(@zone), notice: 'Room was successfully created.' }
         format.json { render :show, status: :created, location: @settings_room }
       else
-        puts "abc"
         format.html { render :new }
         format.json { render json: @settings_room.errors, status: :unprocessable_entity }
       end