Resolve issue_show app

f29ed174 · Luke Bennett · 93b95eac · f29ed174
Commit f29ed174 authored Jan 11, 2018 by Luke Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

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