Fix conflict in app/views/groups/edit.html.haml

0e4536c3 · Clement Ho · d5b1061f · 0e4536c3
Commit 0e4536c3 authored May 25, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/groups/edit.html.haml app/views/groups/edit.html.haml +0 -3

No files found.
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -9,11 +9,8 @@
      = form_errors(@group)
      = render 'shared/group_form', f: f
-<<<<<<< HEAD
      = render 'shared/repository_size_limit_setting', form: f, type: :group
-=======
->>>>>>> gitlab-ce/master
      .form-group.row
        .offset-sm-2.col-sm-10
          .avatar-container.s160