Skip to content

G
gitlab-ce
Commit cf11a9e7 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

Resolve conflicts for app/assets/javascripts/vue_shared/components/ci_icon.vue

parent 98d5506a
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/vue_shared/components/ci_icon.vue
View file @ cf11a9e7
...@@ -21,10 +21,7 @@ import Icon from '../../vue_shared/components/icon.vue'; ...@@ -21,10 +21,7 @@ import Icon from '../../vue_shared/components/icon.vue';
* - Jobs table * - Jobs table
* - Jobs show view header * - Jobs show view header
* - Jobs show view sidebar * - Jobs show view sidebar
<<<<<<< HEAD
* - Linked pipelines * - Linked pipelines
=======
>>>>>>> upstream/master
*/ */
export default { export default {
components: { components: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7