Resolve conflict in app/models/system_note_metadata.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in app/models/system_note_metadata.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
48347a29 · Rémy Coutable · d2bb0c15 · 48347a29
Commit 48347a29 authored Nov 22, 2017 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/system_note_metadata.rb app/models/system_note_metadata.rb +0 -3

No files found.
--- a/app/models/system_note_metadata.rb
+++ b/app/models/system_note_metadata.rb
@@ -7,10 +7,7 @@ class SystemNoteMetadata < ActiveRecord::Base
  TYPES_WITH_CROSS_REFERENCES = %w[
    commit cross_reference
    close duplicate
-<<<<<<< HEAD
    relate unrelate
-=======
->>>>>>> upstream/master
  ].freeze
  ICON_TYPES = %w[