Resolve conflicts in spec/features/markdown/math_spec.rb

spec/features/markdown/math_spec.rb

 require 'spec_helper'
 
 describe 'Math rendering', :js do
-<<<<<<< HEAD
   let!(:project) { create(:project, :public) }
-=======
-  let!(:project)   { create(:project, :public) }
->>>>>>> dev/master
 
   it 'renders inline and display math correctly' do
     description = <<~MATH