fix conflicts for

app/assets/javascripts/environments/components/environment_item.vue app/assets/javascripts/environments/components/environment_actions.vue [ci skip]

fix conflicts for
app/assets/javascripts/environments/components/environment_item.vue app/assets/javascripts/environments/components/environment_actions.vue [ci skip]
bbd0c488 · Filipa Lacerda · d4aa2fd2 · bbd0c488 · bbd0c488
Commit bbd0c488 authored Jan 11, 2018 by Filipa Lacerda
2 changed files
--- a/app/assets/javascripts/environments/components/environment_actions.vue
+++ b/app/assets/javascripts/environments/components/environment_actions.vue
@@ -12,10 +12,6 @@
    components: {
      loadingIcon,
    },
-<<<<<<< HEAD
-=======
->>>>>>> upstream/master
    props: {
      actions: {
        type: Array,

--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue