Resolve conflicts in app/assets/javascripts/environments/components/environments_table.vue

2048dd2e · Stan Hu · 3f698202 · 2048dd2e
Commit 2048dd2e authored Nov 07, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/environments/components/environments_table.vue ...avascripts/environments/components/environments_table.vue +0 -3

No files found.
--- a/app/assets/javascripts/environments/components/environments_table.vue
+++ b/app/assets/javascripts/environments/components/environments_table.vue
@@ -10,10 +10,7 @@ import deployBoard from 'ee/environments/components/deploy_board_component.vue';
 export default {
  components: {
    environmentItem,
-<<<<<<< HEAD
    deployBoard,
-=======
->>>>>>> upstream/master
    GlLoadingIcon,
  },