mirror of
https://github.com/mamoe/mirai.git
synced 2025-01-11 02:50:15 +08:00
Fix clashes on merge
This commit is contained in:
parent
8d2009d273
commit
f862f575d7
@ -153,9 +153,6 @@ public interface CommandManager {
|
|||||||
override suspend fun CommandSender.executeCommand(message: MessageChain): Command? =
|
override suspend fun CommandSender.executeCommand(message: MessageChain): Command? =
|
||||||
CommandManagerImpl.run { executeCommand(message) }
|
CommandManagerImpl.run { executeCommand(message) }
|
||||||
|
|
||||||
override val commandPrefix: String
|
|
||||||
get() = CommandManagerImpl.commandPrefix
|
|
||||||
|
|
||||||
override suspend fun Command.execute(
|
override suspend fun Command.execute(
|
||||||
sender: CommandSender,
|
sender: CommandSender,
|
||||||
args: MessageChain,
|
args: MessageChain,
|
||||||
|
Loading…
Reference in New Issue
Block a user