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/models/dining_charge.rb
+++ b/app/models/dining_charge.rb
@@ -22,7 +22,7 @@ class DiningCharge < ApplicationRecord
      end
      return block_count, price 
    else
-      puts "<<<<<<<< NO"
+      Rails.logger.info "Params not enough"
    end

  end