3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-18 15:45:03 +00:00

Fix merge conflict

This commit is contained in:
Dragory 2019-07-11 12:28:39 +03:00
commit 920e50dda0
2 changed files with 84 additions and 0 deletions

View file

@ -23,6 +23,7 @@ import { UsernameSaver } from "./UsernameSaver";
import { CustomEventsPlugin } from "./CustomEvents";
import { GuildInfoSaverPlugin } from "./GuildInfoSaver";
import { LogServerPlugin } from "./LogServer";
import { CompanionChannelPlugin } from "./CompanionChannels";
/**
* Plugins available to be loaded for individual guilds
@ -50,6 +51,7 @@ export const availablePlugins = [
WelcomeMessagePlugin,
CustomEventsPlugin,
GuildInfoSaverPlugin,
CompanionChannelPlugin,
];
/**