diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-09 12:08:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-09 12:08:17 +0000 |
| commit | a373ecffca1512404cb4f237399e3bf275d87f69 (patch) | |
| tree | 0c131c86a4f88b427c5d644cd14c4596daa87d36 /app/assets/javascripts/merge_conflicts | |
| parent | 1613500bf7400f5692a55fd65235a4a10fc40a7d (diff) | |
| download | gitlab-ce-a373ecffca1512404cb4f237399e3bf275d87f69.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue b/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue index 3e31e2e93ae..5fcc778a714 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue @@ -120,7 +120,7 @@ export default { > <div class="js-file-title file-title file-title-flex-parent cursor-default"> <div class="file-header-content" data-testid="file-name"> - <file-icon :file-name="file.filePath" :size="18" css-classes="gl-mr-2" /> + <file-icon :file-name="file.filePath" :size="16" css-classes="gl-mr-2" /> <strong class="file-title-name">{{ file.filePath }}</strong> </div> <div class="file-actions d-flex align-items-center gl-ml-auto gl-align-self-start"> |