Resolve conflict in lib/settings.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

lib/settings.rb

@@ -56,7 +56,6 @@ class Settings < Settingslogic
       (base_url(gitlab) + [gitlab.relative_url_root]).join('')
     end
 
-<<<<<<< HEAD
     def kerberos_protocol
       kerberos.https ? "https" : "http"
     end
@@ -82,8 +81,6 @@ class Settings < Settingslogic
       kerberos.enabled && (build_gitlab_kerberos_url != build_gitlab_url)
     end
 
-=======
->>>>>>> upstream/master
     # check that values in `current` (string or integer) is a contant in `modul`.
     def verify_constant_array(modul, current, default)
       values = default || []