Generate and add translations

app/assets/javascripts/pipelines/components/dag/dag.vue

@@ -3,10 +3,7 @@ import { GlAlert } from '@gitlab/ui';
 import axios from '~/lib/utils/axios_utils';
 
 export default {
-<<<<<<< HEAD
   // eslint-disable-next-line @gitlab/require-i18n-strings
-=======
->>>>>>> Add DAG scaffolding
   name: 'Dag',
   components: {
     GlAlert,
@@ -23,7 +20,6 @@ export default {
       showFailureAlert: false,
     };
   },
-<<<<<<< HEAD
   computed: {
     shouldDisplayGraph() {
       return !this.showFailureAlert;
@@ -31,11 +27,6 @@ export default {
   },
   mounted() {
     const { drawGraph, reportFailure } = this;
-=======
-  mounted() {
-    const drawGraph = this.drawGraph;
-    const reportFailure = this.reportFailure;
->>>>>>> Add DAG scaffolding
 
     if (!this.graphUrl) {
       reportFailure();
@@ -49,14 +40,11 @@ export default {
       })
       .catch(reportFailure);
   },
-<<<<<<< HEAD
-=======
   computed: {
     shouldDisplayGraph() {
       return !this.showFailureAlert;
     },
   },
->>>>>>> Add DAG scaffolding
   methods: {
     drawGraph(data) {
       return data;