From 59c42c950b76ed99b3349ff64d98f979c75b2701 Mon Sep 17 00:00:00 2001
From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>
Date: Thu, 18 Jul 2024 13:31:04 +0200
Subject: [PATCH] try manual conflict resolving

---
 src/util/entities/Message.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts
index 6f712023..4a1ed5b4 100644
--- a/src/util/entities/Message.ts
+++ b/src/util/entities/Message.ts
@@ -218,6 +218,9 @@ export class Message extends BaseClass {
 	@Column({ type: "simple-json", nullable: true })
 	components?: MessageComponent[];
 
+	@Column({ type: "simple-json", nullable: true })
+	poll?: Poll;
+
 	@Column({ nullable: true })
 	username?: string;