diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-01-22 17:05:27 -0500 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-01-22 17:05:27 -0500 |
| commit | 4f58eedaa13c0c9079c142c577f0fcc2b57ffff6 (patch) | |
| tree | d8436dae8ecd8cfe010c6035c7d41282975ea7e9 | |
| parent | b36f457d304833ba378c7cb7d913edea75070c35 (diff) | |
| download | gitlab-ce-4f58eedaa13c0c9079c142c577f0fcc2b57ffff6.tar.gz | |
resolve conflicts in loading_icon.vue
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/loading_icon.vue | 5 |
1 files changed, 1 insertions, 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" |