Fix a lingering conflict.

2df34c20 · Connor Shea · c648756a · 2df34c20
Unverified Commit 2df34c20 authored Aug 17, 2016 by Connor Shea
--- a/app/models/diff_note.rb
+++ b/app/models/diff_note.rb
@@ -109,11 +109,7 @@ def to_discussion
  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