Resolve conflict in spec/features/protected_branches_spec.rb

spec/features/protected_branches_spec.rb

 require 'spec_helper'
 
 describe 'Protected Branches', :js do
-<<<<<<< HEAD
   include EE::ProtectedBranchHelpers
 
-=======
->>>>>>> upstream/master
   let(:user) { create(:user) }
   let(:admin) { create(:admin) }
   let(:project) { create(:project, :repository) }