Fix wrong conflict resolution

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

app/views/projects/hooks/edit.html.haml

@@ -11,4 +11,3 @@
     = form_for [@project.namespace.becomes(Namespace), @project, @hook], as: :hook, url: namespace_project_hook_path do |f|
       = render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
       = f.submit 'Save changes', class: 'btn btn-create'
-

app/views/shared/web_hooks/_form.html.haml

-<<<<<<< HEAD
-- context_title = @project ? 'project' : 'group'
-
-.row.prepend-top-default
-  .col-lg-3
-    %h4.prepend-top-0
-      = page_title
-    %p
-      #{link_to "Webhooks", help_page_path("user/project/integrations/webhooks")} can be
-      used for binding events when something is happening within the project.
-  .col-lg-9.append-bottom-default
-    = form_for hook, as: :hook, url: polymorphic_path(url_components + [:hooks]) do |f|
-      = form_errors(hook)
 = form_errors(hook)
 
 .form-group