Fix conflict in app/assets/javascripts/boards/components/modal/empty_state.js

app/assets/javascripts/boards/components/modal/empty_state.js

@@ -41,17 +41,10 @@ gl.issueBoards.ModalEmptyState = Vue.extend({
   template: `
     <section class="empty-state">
       <div class="row">
-<<<<<<< HEAD
-        <div class="col-12 col-sm-6 col-sm-last">
-          <aside class="svg-content"><img :src="emptyStateSvg"/></aside>
-        </div>
-        <div class="col-12 col-sm-6 col-sm-first">
-=======
         <div class="col-xs-12 col-sm-6 order-sm-last">
           <aside class="svg-content"><img :src="emptyStateSvg"/></aside>
         </div>
         <div class="col-xs-12 col-sm-6 order-sm-first">
->>>>>>> gitlab-ce/master
           <div class="text-content">
             <h4>{{ contents.title }}</h4>
             <p v-html="contents.content"></p>