Resolve conflict in _form.html.haml

app/views/admin/application_settings/_form.html.haml

@@ -937,10 +937,6 @@
       .col-sm-10
         = f.number_field :throttle_authenticated_web_period_in_seconds, class: 'form-control'
 
-<<<<<<< HEAD
-  - if License.feature_available?(:external_authorization_service)
-    = render partial: 'external_authorization_service_form', locals: { f: f }
-=======
   %fieldset
     %legend Outbound requests
     .form-group
@@ -949,7 +945,9 @@
           = f.label :allow_local_requests_from_hooks_and_services do
             = f.check_box :allow_local_requests_from_hooks_and_services
             Allow requests to the local network from hooks and services
->>>>>>> upstream/master
+
+  - if License.feature_available?(:external_authorization_service)
+    = render partial: 'external_authorization_service_form', locals: { f: f }
 
   .form-actions
     = f.submit 'Save', class: 'btn btn-save'