Fix group_spec.rb conflict

9a4f94a8 · Annabel Dunstone Gray · 8557ea39 · 9a4f94a8
Commit 9a4f94a8 authored May 17, 2017 by Annabel Dunstone Gray
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

spec/features/dashboard/group_spec.rb spec/features/dashboard/group_spec.rb +0 -5

No files found.
--- a/spec/features/dashboard/group_spec.rb
+++ b/spec/features/dashboard/group_spec.rb
@@ -7,12 +7,7 @@ RSpec.describe 'Dashboard Group', feature: true do

  it 'creates new group', js: true do
    visit dashboard_groups_path
-<<<<<<< HEAD
-    click_link 'New group'
-
-=======
    find('.btn-new').trigger('click')
->>>>>>> upstream/master
    new_path = 'Samurai'
    new_description = 'Tokugawa Shogunate'