Skip to content

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

[ci skip] Fix conflict for app/assets/javascripts/issue_show/components/app.vue

parent 432e276c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
app/assets/javascripts/issue_show/components/app.vue
View file @ d4aa2fd2
...@@ -267,6 +267,7 @@ ...@@ -267,6 +267,7 @@
:project-path="projectPath" :project-path="projectPath"
:project-namespace="projectNamespace" :project-namespace="projectNamespace"
:show-delete-button="showDeleteButton" :show-delete-button="showDeleteButton"
:can-attach-file="canAttachFile"
:enable-autocomplete="enableAutocomplete" :enable-autocomplete="enableAutocomplete"
/> />
......
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