Fix conflicts for app/assets/javascripts/environments/components/environment_monitoring.vue

78114e2f · Filipa Lacerda · ea6dc253 · 78114e2f
Commit 78114e2f authored Jan 11, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 15 deletions

app/assets/javascripts/environments/components/environment_monitoring.vue ...cripts/environments/components/environment_monitoring.vue +0 -15

No files found.
--- a/app/assets/javascripts/environments/components/environment_monitoring.vue
+++ b/app/assets/javascripts/environments/components/environment_monitoring.vue
 <script>
  /**
-<<<<<<< HEAD
-   * Renders the Monitoring (Metrics) link in environments table.
-   */
-=======
  * Renders the Monitoring (Metrics) link in environments table.
  */
->>>>>>> upstream/master
  import tooltip from '../../vue_shared/directives/tooltip';

  export default {
    directives: {
      tooltip,
-<<<<<<< HEAD
-    },
-    props: {
-      monitoringUrl: {
-        type: String,
-        required: true,
-      },
-    },
-=======
    },

    props: {
@@ -29,7 +15,6 @@
        required: true,
      },
    },
->>>>>>> upstream/master

    computed: {
      title() {