lib/finapps/rest/alert_settings.rb in finapps-1.0.3 vs lib/finapps/rest/alert_settings.rb in finapps-1.0.4

@@ -4,28 +4,24 @@
     require 'erb'
 
     class AlertSettings < FinApps::REST::Resources
       include FinApps::REST::Defaults
 
+      # Shows alert settings for a given user.
       # @return [Hash, Array<String>]
       def show
         end_point = Defaults::END_POINTS[:alert_settings_show]
         logger.debug "##{__method__.to_s} => end_point: #{end_point}"
 
         path = end_point
         logger.debug "##{__method__.to_s} => path: #{path}"
 
-<<<<<<< HEAD
-        result, error_messages = @client.send(path, :get)
-=======
-        result, error_messages = @client.send_request(path, :get)
-
-        logger.debug "##{__method__.to_s} => Completed"
->>>>>>> develop
+        result, error_messages = client.send_request(path, :get)
         return result, error_messages
       end
 
+      # Updates alert settings for a given user.
       # @return [Hash, Array<String>]
       def update(params)
         raise MissingArgumentsError.new 'Missing argument: params.' if params.blank?
         logger.debug "##{__method__.to_s} => params: #{params.inspect}"
 
@@ -33,18 +29,12 @@
         logger.debug "##{__method__.to_s} => end_point: #{end_point}"
 
         path = end_point
         logger.debug "##{__method__.to_s} => path: #{path}"
 
-<<<<<<< HEAD
-        _, error_messages = @client.send(path, :put, params.compact)
-=======
-        _, error_messages = @client.send_request(path, :put, params.compact)
-
-        logger.debug "##{__method__.to_s} => Completed"
->>>>>>> develop
+        _, error_messages = client.send_request(path, :put, params.compact)
         error_messages
       end
 
     end
   end
-end
+end
\ No newline at end of file