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

d4aa2fd2 · Filipa Lacerda · 432e276c · d4aa2fd2
Commit d4aa2fd2 authored Jan 11, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

app/assets/javascripts/issue_show/components/app.vue app/assets/javascripts/issue_show/components/app.vue +1 -0

No files found.
--- a/app/assets/javascripts/issue_show/components/app.vue
+++ b/app/assets/javascripts/issue_show/components/app.vue
@@ -267,6 +267,7 @@
        :project-path="projectPath"
        :project-namespace="projectNamespace"
        :show-delete-button="showDeleteButton"
+        :can-attach-file="canAttachFile"
        :enable-autocomplete="enableAutocomplete"
      />