try manual conflict resolving

1 files changed, 3 insertions, 0 deletions

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

index 6f7120231..4a1ed5b42 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;