update conflic for pull master

2018-02-23 14:58:35 +06:30
parent 8069ac15ca 77a66d726b
commit ac47501e01
19 changed files with 284 additions and 125 deletions
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -33,7 +33,7 @@ class License
    ##Get redis connection from connection pool
    redis = Redis.new
    cache_license = redis.get(cache_key)    
-
+    
    Rails.logger.info "Cache key - " + cache_key.to_s
    if cache_license.nil?
      ##change the d/e key