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/Message.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/util/entities/Message.ts') diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts index 2b5e6f86..5af3d50d 100644 --- a/src/util/entities/Message.ts +++ b/src/util/entities/Message.ts @@ -1,4 +1,4 @@ -import { Column, CreateDateColumn, Entity, Index, JoinColumn, JoinTable, ManyToMany, ManyToOne, OneToMany, RelationId } from "typeorm"; +import { Column, CreateDateColumn, Entity, Index, JoinColumn, JoinTable, ManyToMany, ManyToOne, OneToMany, Relation, RelationId } from "typeorm"; import { InteractionType } from "../interfaces/Interaction"; import { Application } from "./Application"; import { Attachment } from "./Attachment"; -- cgit 1.5.1