Commit cf11a9e7 authored by Filipa Lacerda's avatar Filipa Lacerda

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

parent 98d5506a
......@@ -21,10 +21,7 @@ import Icon from '../../vue_shared/components/icon.vue';
* - Jobs table
* - Jobs show view header
* - Jobs show view sidebar
<<<<<<< HEAD
* - Linked pipelines
=======
>>>>>>> upstream/master
*/
export default {
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