diff options
| author | TheArcaneBrony <myrainbowdash949@gmail.com> | 2022-08-27 07:22:01 +0200 |
|---|---|---|
| committer | TheArcaneBrony <myrainbowdash949@gmail.com> | 2022-08-30 17:10:46 +0200 |
| commit | 05f6a0d6de75f7181e94d78cf8b5836a2ffb74b1 (patch) | |
| tree | 9ffa7e41ff35d8e90bb5dad2c47816238e46965e /src/util/entities/Member.ts | |
| parent | Merge 'webrtc' into 'dev/staging_webrtc' (diff) | |
| download | server-05f6a0d6de75f7181e94d78cf8b5836a2ffb74b1.tar.xz | |
Fix merge conflicts
Diffstat (limited to 'src/util/entities/Member.ts')
| -rw-r--r-- | src/util/entities/Member.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util/entities/Member.ts b/src/util/entities/Member.ts index f5329481..de78e324 100644 --- a/src/util/entities/Member.ts +++ b/src/util/entities/Member.ts @@ -1,4 +1,4 @@ -import { Column, Entity, Index, JoinColumn, JoinTable, ManyToMany, ManyToOne, PrimaryGeneratedColumn, RelationId } from "typeorm"; +import { Column, Entity, Index, JoinColumn, JoinTable, ManyToMany, ManyToOne, PrimaryGeneratedColumn, Relation, RelationId } from "typeorm"; import { Ban, PublicGuildRelations } from "."; import { GuildCreateEvent, GuildDeleteEvent, GuildMemberAddEvent, GuildMemberRemoveEvent, GuildMemberUpdateEvent } from "../interfaces"; import { Config, emitEvent } from "../util"; |