From 05f6a0d6de75f7181e94d78cf8b5836a2ffb74b1 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Sat, 27 Aug 2022 07:22:01 +0200 Subject: Fix merge conflicts --- src/util/entities/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/util/entities/User.ts') diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts index 760ef9c7..bf27fc11 100644 --- a/src/util/entities/User.ts +++ b/src/util/entities/User.ts @@ -1,4 +1,4 @@ -import { Column, Entity, FindOneOptions, FindOptionsSelectByString, JoinColumn, OneToMany, OneToOne } from "typeorm"; +import { Column, Entity, FindOneOptions, FindOptionsSelectByString, JoinColumn, OneToMany, OneToOne, Relation } from "typeorm"; import { Member, Session, UserSettings } from "."; import { Config, FieldErrors, Snowflake, trimSpecial } from ".."; import { BitField } from "../util/BitField"; -- cgit 1.5.1