Resolve conflict in issue_sidebar_basic_entity.rb

e7f72dc4 · Marin Jankovski · 82ae861d · e7f72dc4
Commit e7f72dc4 authored Dec 25, 2018 by Marin Jankovski
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/serializers/issue_sidebar_basic_entity.rb app/serializers/issue_sidebar_basic_entity.rb +0 -3

No files found.
--- a/app/serializers/issue_sidebar_basic_entity.rb
+++ b/app/serializers/issue_sidebar_basic_entity.rb
@@ -4,8 +4,5 @@ class IssueSidebarBasicEntity < IssuableSidebarBasicEntity
  expose :due_date
  expose :confidential
 end
-<<<<<<< HEAD

 IssueSidebarBasicEntity.prepend(EE::IssueSidebarBasicEntity)
-=======
->>>>>>> upstream/master