Resolve app/services/boards/lists/create_service.rb

934e2c49 · Sean McGivern · 69b538ba · 934e2c49
Commit 934e2c49 authored Jun 08, 2018 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/boards/lists/create_service.rb app/services/boards/lists/create_service.rb +0 -3

No files found.
--- a/app/services/boards/lists/create_service.rb
+++ b/app/services/boards/lists/create_service.rb
 module Boards
  module Lists
    class CreateService < Boards::BaseService
-<<<<<<< HEAD
      prepend EE::Boards::Lists::CreateService

-=======
->>>>>>> upstream/master
      include Gitlab::Utils::StrongMemoize

      def execute(board)