Resolve conflict in spec/javascripts/environments/emtpy_state_spec.js

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

Resolve conflict in spec/javascripts/environments/emtpy_state_spec.js
Signed-off-by: Rémy Coutable <remy@rymai.me>
3c50e0ed · Rémy Coutable · 2108e636 · 3c50e0ed
Commit 3c50e0ed authored Nov 23, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

spec/javascripts/environments/emtpy_state_spec.js spec/javascripts/environments/emtpy_state_spec.js +0 -4

No files found.
--- a/spec/javascripts/environments/emtpy_state_spec.js
+++ b/spec/javascripts/environments/emtpy_state_spec.js
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/master
 import Vue from 'vue';
 import emptyState from '~/environments/components/empty_state.vue';
 import mountComponent from '../helpers/vue_mount_component_helper';