Resolve conflict on SlashCommands

a90d72a2 · Mark Chao · 9a101df9 · a90d72a2
Commit a90d72a2 authored Jun 04, 2018 by Mark Chao
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/gitlab/slash_commands/command.rb lib/gitlab/slash_commands/command.rb +0 -3

No files found.
--- a/lib/gitlab/slash_commands/command.rb
+++ b/lib/gitlab/slash_commands/command.rb
 module Gitlab
  module SlashCommands
    class Command < BaseCommand
-<<<<<<< HEAD
      prepend EE::Gitlab::SlashCommands::Command

-=======
->>>>>>> upstream/master
      def self.commands
        [
          Gitlab::SlashCommands::IssueShow,