Fix a lingering conflict.

2016-08-17 12:29:05 -06:00 · 2016-08-17 12:29:05 -06:00 · 2df34c20cb
parent c648756a36
commit 2df34c20cb
1 changed files with 1 additions and 5 deletions
--- a/app/models/diff_note.rb
+++ b/app/models/diff_note.rb
@ -109,11 +109,7 @@ class DiffNote < Note
  private

  def supported?
-<<<<<<< HEAD
-    for_commit? || self.noteable.support_new_diff_notes?
-=======
-    !self.for_merge_request? || self.noteable.has_complete_diff_refs?
->>>>>>> master
+    for_commit? || self.noteable.has_complete_diff_refs?
  end

  def noteable_diff_refs