mirror of
https://github.com/spacebarchat/server.git
synced 2024-11-05 18:32:33 +01:00
try manual conflict resolving
This commit is contained in:
parent
6be3714593
commit
59c42c950b
@ -218,6 +218,9 @@ export class Message extends BaseClass {
|
|||||||
@Column({ type: "simple-json", nullable: true })
|
@Column({ type: "simple-json", nullable: true })
|
||||||
components?: MessageComponent[];
|
components?: MessageComponent[];
|
||||||
|
|
||||||
|
@Column({ type: "simple-json", nullable: true })
|
||||||
|
poll?: Poll;
|
||||||
|
|
||||||
@Column({ nullable: true })
|
@Column({ nullable: true })
|
||||||
username?: string;
|
username?: string;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user