diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-30 14:02:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-30 14:02:35 +0300 |
| commit | 434a0ce52d75e13d48eac9ce83774954c7c5d48d (patch) | |
| tree | de3b7a7cf1ce8b07555f28df592297c76894c90f /app/assets/javascripts/merge_conflicts/merge_conflict_store.js | |
| parent | 0a0d9493ca481c56b739a3df27c31262283150fe (diff) | |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc2
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/merge_conflict_store.js')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js index 25c357b6073..c803774f4a7 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js @@ -54,7 +54,6 @@ import { s__ } from '~/locale'; file.promptDiscardConfirmation = false; file.resolveMode = DEFAULT_RESOLVE_MODE; file.filePath = this.getFilePath(file); - file.iconClass = `fa-${file.blob_icon}`; file.blobPath = file.blob_path; if (file.type === CONFLICT_TYPES.TEXT) { |