Resolve conflicts spec/features/projects/issuable_templates_spec.rb

spec/features/projects/issuable_templates_spec.rb

 require 'spec_helper'
 
-<<<<<<< HEAD
-feature 'issuable templates', js: true do
-=======
 feature 'issuable templates', :js do
->>>>>>> ce-com/master
   include ProjectForksHelper
 
   let(:user) { create(:user) }