From 2df34c20cb3d0346f5bb53b995d41a8c36ad71cb Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Wed, 17 Aug 2016 12:29:05 -0600
Subject: [PATCH] Fix a lingering conflict.

---
 app/models/diff_note.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb
index ed091b34925..1ca37c4a5bf 100644
--- 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