Resolve conflicts in app/models/system_note_metadata.rb

2244d9ab · Stan Hu · 2ae89a0b · 2244d9ab
Commit 2244d9ab authored Oct 06, 2018 by Stan Hu
Hide 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
@@ -11,10 +11,7 @@ class SystemNoteMetadata < ActiveRecord::Base
  TYPES_WITH_CROSS_REFERENCES = %w[
    commit cross_reference
    close duplicate
-<<<<<<< HEAD
    relate unrelate
-=======
->>>>>>> upstream/master
    moved
  ].freeze