Resolve app/services/boards/issues/list_service.rb

f45c9611 · Robert Speicher · 9e4f3224 · f45c9611
Commit f45c9611 authored Jul 30, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/boards/issues/list_service.rb app/services/boards/issues/list_service.rb +0 -3

No files found.
--- a/app/services/boards/issues/list_service.rb
+++ b/app/services/boards/issues/list_service.rb
@@ -3,10 +3,7 @@
 module Boards
  module Issues
    class ListService < Boards::BaseService
-<<<<<<< HEAD
      prepend EE::Boards::Issues::ListService
-=======
->>>>>>> upstream/master
      include Gitlab::Utils::StrongMemoize

      def execute