Fix conflict app/assets/javascripts/environments/folder/environments_folder_view.vue

ced89e04 · Filipa Lacerda · b5cfb40c · ced89e04
Commit ced89e04 authored Jan 11, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/environments/folder/environments_folder_view.vue ...ascripts/environments/folder/environments_folder_view.vue +0 -4

No files found.
--- a/app/assets/javascripts/environments/folder/environments_folder_view.vue
+++ b/app/assets/javascripts/environments/folder/environments_folder_view.vue
@@ -29,10 +29,6 @@
        required: true,
      },
    },
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master
    methods: {
      successCallback(resp) {
        this.saveData(resp);