Fix merge conflicts

1 files changed, 1 insertions, 1 deletions

diff --git a/src/util/entities/BackupCodes.ts b/src/util/entities/BackupCodes.ts

index 79b60a5e..c4c61af1 100644
--- a/src/util/entities/BackupCodes.ts
+++ b/src/util/entities/BackupCodes.ts
@@ -1,4 +1,4 @@
-import { Column, Entity, JoinColumn, ManyToOne } from "typeorm";
+import { Column, Entity, JoinColumn, ManyToOne, Relation } from "typeorm";
 import { BaseClass } from "./BaseClass";
 import { User } from "./User";