diff options
| author | TymanWasTaken <32660892+tymanwastaken@users.noreply.github.com> | 2021-05-28 21:54:50 -0600 |
|---|---|---|
| committer | TymanWasTaken <32660892+tymanwastaken@users.noreply.github.com> | 2021-05-28 21:54:50 -0600 |
| commit | 2456dab3db0d8eaae515606b83a6c0c317d009b0 (patch) | |
| tree | c20448112d43c1b4ffae1395584d9b202aeee3ed /src/inhibitors | |
| parent | 1e9e334097702c68d871365fc016aa096d03c491 (diff) | |
| parent | 5b5f0bf5667b922037508dfa88e40a1f8a2671ec (diff) | |
| download | tanzanite-2456dab3db0d8eaae515606b83a6c0c317d009b0.tar.gz tanzanite-2456dab3db0d8eaae515606b83a6c0c317d009b0.tar.bz2 tanzanite-2456dab3db0d8eaae515606b83a6c0c317d009b0.zip | |
fix conflicts
Diffstat (limited to 'src/inhibitors')
| -rw-r--r-- | src/inhibitors/blacklist/blacklist.ts (renamed from src/inhibitors/blacklist/BlacklistInhibitor.ts) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/inhibitors/blacklist/BlacklistInhibitor.ts b/src/inhibitors/blacklist/blacklist.ts index 82db4c2..309815f 100644 --- a/src/inhibitors/blacklist/BlacklistInhibitor.ts +++ b/src/inhibitors/blacklist/blacklist.ts @@ -1,6 +1,6 @@ -import { BotInhibitor } from '../../lib/extensions/BotInhibitor'; +import { BushInhibitor } from '../../lib/extensions/BushInhibitor'; -export default class BlacklistInhibitor extends BotInhibitor { +export default class BlacklistInhibitor extends BushInhibitor { constructor() { super('blacklist', { reason: 'blacklist' |