Resolve conflict in app/assets/javascripts/environments/mixins/environments_mixin.js

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/javascripts/environments/mixins/environments_mixin.js

@@ -21,10 +21,7 @@ import tabs from '../../vue_shared/components/navigation_tabs.vue';
 import container from '../components/container.vue';
 
 export default {
-<<<<<<< HEAD
 
-=======
->>>>>>> origin/master
   components: {
     environmentTable,
     container,
@@ -61,10 +58,7 @@ export default {
         }
       });
     },
-<<<<<<< HEAD
 
-=======
->>>>>>> origin/master
     /**
      * Handles URL and query parameter changes.
      * When the user uses the pagination or the tabs,