Fix merge conflicts

This commit is contained in:
chroventer
2020-10-02 02:44:52 -07:00
34 changed files with 214 additions and 222 deletions
+5 -6
View File
@@ -1,10 +1,9 @@
import type { Permission } from "../types/permission.ts";
import type { Role } from "../structures/role.ts";
import type { Guild } from "../structures/guild.ts";
import { Permissions } from "../types/permission.ts";
import { botID } from "../module/client.ts";
import { cacheHandlers } from "../controllers/cache.ts";
import { botID } from "../module/client.ts";
import type { Guild } from "../structures/guild.ts";
import type { Role } from "../structures/role.ts";
import type { Permission } from "../types/permission.ts";
import { Permissions } from "../types/permission.ts";
/** Checks if the member has this permission. If the member is an owner or has admin perms it will always be true. */
export async function memberIDHasPermission(