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/rooms_controller.rb
+++ b/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