Fix a lingering conflict.
This commit is contained in:
parent
c648756a36
commit
2df34c20cb
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue