Fix prettier conflicts

app/assets/javascripts/environments/components/environment_item.vue

@@ -471,7 +471,6 @@ export default {
       <div v-if="!model.isFolder" class="table-mobile-header" role="rowheader">
         {{ s__('Environments|Environment') }}
       </div>
-<<<<<<< HEAD
 
       <span v-if="model.hasDeployBoard" class="deploy-board-icon" @click="toggleDeployBoard">
         <icon :name="deployIconName" />
@@ -490,18 +489,6 @@ export default {
 
         <span> {{ model.folderName }} </span>
 
-=======
-      <span v-if="!model.isFolder" class="environment-name table-mobile-content">
-        <a class="qa-environment-link" :href="environmentPath"> {{ model.name }} </a>
-      </span>
-      <span v-else class="folder-name" role="button" @click="onClickFolder">
-        <icon :name="folderIconName" class="folder-icon" />
-
-        <icon name="folder" class="folder-icon" />
-
-        <span> {{ model.folderName }} </span>
-
->>>>>>> upstream/master
         <span class="badge badge-pill"> {{ model.size }} </span>
       </span>
     </div>

app/assets/javascripts/environments/components/environments_table.vue

@@ -71,7 +71,6 @@ export default {
         :can-read-environment="canReadEnvironment"
       />
 
-<<<<<<< HEAD
       <div
         v-if="model.hasDeployBoard && model.isDeployBoardVisible"
         :key="`deploy-board-row-${i}`"
@@ -87,8 +86,6 @@ export default {
         </div>
       </div>
 
-=======
->>>>>>> upstream/master
       <template v-if="shouldRenderFolderContent(model)">
         <div v-if="model.isLoadingFolderContent" :key="`loading-item-${i}`">
           <gl-loading-icon :size="2" />

app/assets/javascripts/monitoring/components/dashboard.vue

@@ -199,11 +199,7 @@ export default {
 
 <template>
   <div v-if="!showEmptyState" :key="forceRedraw" class="prometheus-graphs prepend-top-default">
-<<<<<<< HEAD
     <div v-if="showEnvironmentDropdown" class="environments d-flex align-items-center">
-=======
-    <div class="environments d-flex align-items-center">
->>>>>>> upstream/master
       {{ s__('Metrics|Environment') }}
       <div class="dropdown prepend-left-10">
         <button class="dropdown-menu-toggle" data-toggle="dropdown" type="button">

app/assets/javascripts/monitoring/components/graph/flag.vue

@@ -121,19 +121,11 @@ export default {
     <div v-if="showFlagContent" :class="flagOrientation" class="prometheus-graph-flag popover">
       <div class="arrow-shadow"></div>
       <div class="arrow"></div>
-<<<<<<< HEAD
       <div class="popover-header">
         <h5 v-if="deploymentFlagData">Deployed</h5>
         {{ formatDate }} <strong>{{ formatTime }}</strong>
       </div>
       <div v-if="deploymentFlagData" class="popover-body deploy-meta-content">
-=======
-      <div class="popover-title">
-        <h5 v-if="deploymentFlagData">Deployed</h5>
-        {{ formatDate }} <strong>{{ formatTime }}</strong>
-      </div>
-      <div v-if="deploymentFlagData" class="popover-content deploy-meta-content">
->>>>>>> upstream/master
         <div>
           <icon :size="12" name="commit" />
           <a :href="deploymentFlagData.commitUrl"> {{ deploymentFlagData.sha.slice(0, 8) }} </a>

app/assets/javascripts/notes/components/note_form.vue

@@ -190,7 +190,6 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea qa-reply-input"
         </textarea>
       </markdown-field>
       <div class="note-form-actions clearfix">
-<<<<<<< HEAD
         <template v-if="showBatchCommentsActions">
           <p v-if="discussion && discussion.id">
             <label>
@@ -243,7 +242,7 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea qa-reply-input"
           <button
             :disabled="isDisabled"
             type="button"
-            class="js-vue-issue-save btn btn-success js-comment-button"
+            class="js-vue-issue-save btn btn-success js-comment-button "
             @click="handleUpdate();"
           >
             {{ saveButtonTitle }}
@@ -263,30 +262,6 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea qa-reply-input"
             Cancel
           </button>
         </template>
-=======
-        <button
-          :disabled="isDisabled"
-          type="button"
-          class="js-vue-issue-save btn btn-success js-comment-button "
-          @click="handleUpdate();"
-        >
-          {{ saveButtonTitle }}
-        </button>
-        <button
-          v-if="discussion.resolvable"
-          class="btn btn-nr btn-default append-right-10 js-comment-resolve-button"
-          @click.prevent="handleUpdate(true);"
-        >
-          {{ resolveButtonTitle }}
-        </button>
-        <button
-          class="btn btn-cancel note-edit-cancel js-close-discussion-note-form"
-          type="button"
-          @click="cancelHandler();"
-        >
-          Cancel
-        </button>
->>>>>>> upstream/master
       </div>
     </form>
   </div>

app/assets/javascripts/pipelines/components/graph/graph_component.vue

@@ -74,7 +74,6 @@ export default {
   <div class="build-content middle-block js-pipeline-graph">
     <div class="pipeline-visualization pipeline-graph pipeline-tab-content">
       <div class="text-center"><gl-loading-icon v-if="isLoading" :size="3" /></div>
-<<<<<<< HEAD
 
       <linked-pipelines-column
         v-if="hasTriggeredBy"
@@ -90,10 +89,6 @@ export default {
         }"
         class="stage-column-list"
       >
-=======
-
-      <ul v-if="!isLoading" class="stage-column-list">
->>>>>>> upstream/master
         <stage-column-component
           v-for="(stage, index) in graph"
           :key="stage.name"

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

@@ -139,7 +139,6 @@ export default {
           </div>
           <div>
             <span class="mr-widget-pipeline-graph">
-<<<<<<< HEAD
               <span class="stage-cell">
                 <linked-pipelines-mini-list v-if="triggeredBy.length" :triggered-by="triggeredBy" />
                 <template v-if="hasStages">
@@ -156,16 +155,6 @@ export default {
                     <pipeline-stage :stage="stage" />
                   </div>
                 </template>
-=======
-              <span v-if="hasStages" class="stage-cell">
-                <div
-                  v-for="(stage, i) in pipeline.details.stages"
-                  :key="i"
-                  class="stage-container dropdown js-mini-pipeline-graph mr-widget-pipeline-stages"
-                >
-                  <pipeline-stage :stage="stage" />
-                </div>
->>>>>>> upstream/master
               </span>
 
               <linked-pipelines-mini-list v-if="triggered.length" :triggered="triggered" />

app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue

@@ -97,12 +97,9 @@ export default {
 
 <template>
   <div :class="blockClass" class="block">
-<<<<<<< HEAD
-=======
     <div class="issuable-sidebar-header">
       <toggle-sidebar :collapsed="collapsed" @toggle="toggleSidebar" />
     </div>
->>>>>>> upstream/master
     <collapsed-calendar-icon :text="collapsedText" class="sidebar-collapsed-icon" />
     <div class="title">
       {{ label }}
@@ -136,11 +133,7 @@ export default {
             -
             <button
               type="button"
-<<<<<<< HEAD
-              class="btn-blank btn-link btn-default-hover-link"
-=======
               class="btn-blank btn-link btn-secondary-hover-link"
->>>>>>> upstream/master
               @click="newDateSelected(null);"
             >
               remove