Resolve conflicts in spec/features/protected_branches_spec.rb

2eaf9586 · Stan Hu · 531bad77 · 2eaf9586
Commit 2eaf9586 authored Jun 27, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/features/protected_branches_spec.rb spec/features/protected_branches_spec.rb +0 -3

No files found.
--- a/spec/features/protected_branches_spec.rb
+++ b/spec/features/protected_branches_spec.rb
@@ -147,12 +147,9 @@ feature 'Protected Branches', :js do

        visit project_protected_branches_path(project)
        set_protected_branch_name('*-stable')
-<<<<<<< HEAD
        set_allowed_to('merge')
        set_allowed_to('push')
-=======
        set_defaults
->>>>>>> upstream/master
        click_on "Protect"

        visit project_protected_branches_path(project)