fixed conflict after merge with dev

app/controllers/crm/customers_controller.rb

@@ -103,11 +103,6 @@ class Crm::CustomersController < BaseCrmController
         end
       end
     end
-
-    # if flash["errors"]
-    #   @crm_customer.valid?
-    # end
-    # puts @crm_customers.to_json
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @crm_customers }

app/controllers/crm/dining_queues_controller.rb

@@ -39,7 +39,6 @@ class Crm::DiningQueuesController < BaseCrmController
   # POST /crm/dining_queues
   # POST /crm/dining_queues.json
   def create
-    puts dining_queue_params
     @dining_queue = DiningQueue.new(dining_queue_params)
     @dining_queue.shop_code = @shop.shop_code
     respond_to do |format|