Fix for admin_groups_spec.rb Conflict

1336f01c · Tim Zallmann · 886dd5ae · 1336f01c
Commit 1336f01c authored Jun 12, 2017 by Tim Zallmann
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

spec/features/admin/admin_groups_spec.rb spec/features/admin/admin_groups_spec.rb +0 -5

No files found.
--- a/spec/features/admin/admin_groups_spec.rb
+++ b/spec/features/admin/admin_groups_spec.rb
@@ -24,14 +24,9 @@ feature 'Admin Groups', feature: true do
    it 'creates new group' do
      visit admin_groups_path

-<<<<<<< HEAD
-      click_link "New group"
-
-=======
      page.within '#content-body' do
        click_link "New group"
      end
->>>>>>> ce-com/master
      path_component = 'gitlab'
      group_name = 'GitLab group name'
      group_description = 'Description of group for GitLab'