# Conflicts:
#	app/assets/javascripts/diffs/components/inline_diff_comment_row.vue
#	spec/javascripts/diffs/store/getters_spec.js