Fix conflict in app/assets/javascripts/ide/components/new_dropdown/modal.vue

app/assets/javascripts/ide/components/new_dropdown/modal.vue

@@ -75,19 +75,6 @@ export default {
       @submit.prevent="createEntryInStore"
       class="form-group row append-bottom-0"
     >
-<<<<<<< HEAD
-      <label class="label-light col-form-label col-sm-3 ide-new-modal-label">
-        {{ __('Name') }}
-      </label>
-      <div class="col-sm-9">
-        <input
-          type="text"
-          class="form-control"
-          v-model="entryName"
-          ref="fieldName"
-        />
-      </div>
-=======
       <fieldset class="form-group append-bottom-0">
         <label class="label-light col-form-label col-sm-3 ide-new-modal-label">
           {{ __('Name') }}
@@ -101,7 +88,6 @@ export default {
           />
         </div>
       </fieldset>
->>>>>>> gitlab-ce/master
     </form>
   </deprecated-modal>
 </template>