Fix conflicts for app/assets/javascripts/boards/components/issue_card_inner.js

d9c61790 · Filipa Lacerda · fab47065 · d9c61790
Commit d9c61790 authored Jun 14, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/boards/components/issue_card_inner.js app/assets/javascripts/boards/components/issue_card_inner.js +0 -3

No files found.
--- a/app/assets/javascripts/boards/components/issue_card_inner.js
+++ b/app/assets/javascripts/boards/components/issue_card_inner.js
@@ -12,10 +12,7 @@ window.gl.issueBoards = window.gl.issueBoards || {};
 gl.issueBoards.IssueCardInner = Vue.extend({
  components: {
    UserAvatarLink,
-<<<<<<< HEAD
    IssueCardWeight,
-=======
->>>>>>> upstream/master
  },
  props: {
    issue: {