lib/finapps/utils/logging.rb in finapps-1.0.2 vs lib/finapps/utils/logging.rb in finapps-1.0.3

@@ -33,21 +33,13 @@
         end
       end
 
     end
 
-<<<<<<< HEAD
-    def set_up_logger_level(logger_level)
-      unless logger_level.blank? || logger.level == logger_level
-        logger.info "##{__method__.to_s} => Setting logger level to #{SEVERITY_LABEL[logger_level]}"
-        logger.level = logger_level
-      end
-=======
     def logger_config(config)
       Logging.tag= config[:logger_tag] if config[:logger_tag].present?
       Logging.level = config[:log_level] if config[:log_level].present?
->>>>>>> develop
     end
 
     # noinspection SpellCheckingInspection
     def set_up_logger_session_params(uuid, session_id)
       if uuid.present? || session_id.present?
@@ -98,6 +90,6 @@
     def severity_to_color(severity)
       SEVERITY_COLOR_MAP[severity.downcase.to_sym]
     end
 
   end
-end
+end
\ No newline at end of file