From 4f58eedaa13c0c9079c142c577f0fcc2b57ffff6 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jschatz@gitlab.com>
Date: Mon, 22 Jan 2018 17:05:27 -0500
Subject: resolve conflicts in loading_icon.vue

---
 app/assets/javascripts/vue_shared/components/loading_icon.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/assets/javascripts/vue_shared/components/loading_icon.vue b/app/assets/javascripts/vue_shared/components/loading_icon.vue
index 625d9300db0..dd5f41c2694 100644
--- a/app/assets/javascripts/vue_shared/components/loading_icon.vue
+++ b/app/assets/javascripts/vue_shared/components/loading_icon.vue
@@ -32,13 +32,10 @@
 </script>
 <template>
   <component
-<<<<<<< HEAD
     :is="this.rootElementType"
-    class="text-center">
-=======
+    class="text-center"
     :is="rootElementType"
     class="loading-container text-center">
->>>>>>> 218136ac405... Merge branch 'tz-fix-ide-bugs' into 'master'
     <i
       class="fa fa-spin fa-spinner"
       :class="cssClass"
-- 
cgit v1.2.1