merge conflicts solved

This commit is contained in:
Ulf Gebhardt 2023-06-20 09:18:41 +02:00
parent d680a4b05f
commit a8407618bd
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
4 changed files with 4 additions and 1 deletions

View File

@ -21,6 +21,9 @@ export class Community extends BaseEntity {
@Column({ name: 'public_key', type: 'binary', length: 32, nullable: false })
publicKey: Buffer
@Column({ name: 'private_key', type: 'binary', length: 64, nullable: true })
privateKey: Buffer | null
@Column({
name: 'community_uuid',
type: 'char',

View File

@ -1 +1 @@
export { FederatedCommunity } from './0067-community_tables_public_key_length/FederatedCommunity'
export { FederatedCommunity } from './0068-community_tables_public_key_length/FederatedCommunity'