Fix conflicts for app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue

089e7686 · Filipa Lacerda · 740e0320 · 089e7686
Commit 089e7686 authored Jun 14, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue ...ipts/sidebar/components/time_tracking/comparison_pane.vue +0 -6

No files found.
--- a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
@@ -58,12 +58,6 @@ export default {
      :title="timeRemainingTooltip"
      :class="timeRemainingStatusClass"
      class="compare-meter"
-<<<<<<< HEAD
-=======
-      data-toggle="tooltip"
-      data-placement="top"
-      role="timeRemainingDisplay"
->>>>>>> upstream/master
    >
      <div
        :aria-valuenow="timeRemainingPercent"