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/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -38,7 +38,7 @@ class ActionController::Base
    elsif (flag == 2)
      flash[:notice] = 'Expiring! Please, License extend...'
    else
-      puts "RUN SAY BYAR"
+      Rails.logger.info "Run License"
    end
  end