resolve rebase conflicts

packages/api/src/entity/folder_policy.ts

@@ -35,9 +35,6 @@ export class FolderPolicy {
   @Column('int')
   afterDays!: number
 
-  @Column('int')
-  minimumItems!: number
-
   @CreateDateColumn({
     type: 'timestamptz',
     default: () => 'CURRENT_TIMESTAMP',

packages/api/test/resolvers/folder_policy.test.ts

@@ -102,7 +102,6 @@ describe('Folder Policy API', () => {
         folder: 'test-folder',
         action: FolderPolicyAction.Archive,
         afterDays: 30,
-        minimumItems: 10,
       }
 
       const res = await graphqlRequest(mutation, authToken, { input }).expect(
@@ -160,7 +159,6 @@ describe('Folder Policy API', () => {
         id: existingPolicy.id,
         action: FolderPolicyAction.Delete,
         afterDays: 30,
-        minimumItems: 10,
       }
 
       const res = await graphqlRequest(mutation, authToken, { input }).expect(