Resolved conflict in app/services/application_settings/update_service.rb

02e808bf · Mario de la Ossa · bca0dfcb · 02e808bf
Commit 02e808bf authored Jun 05, 2018 by Mario de la Ossa
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/application_settings/update_service.rb app/services/application_settings/update_service.rb +0 -3

No files found.
--- a/app/services/application_settings/update_service.rb
+++ b/app/services/application_settings/update_service.rb
 module ApplicationSettings
  class UpdateService < ApplicationSettings::BaseService
-<<<<<<< HEAD
    prepend EE::ApplicationSettings::UpdateService

-=======
->>>>>>> upstream/master
    attr_reader :params, :application_setting

    def execute