fix: resolve post-rebase merge issues

lnco-epfl · Jan 21, 2025 · b159e29 · b159e29
2 parents e61d295 + 8f3f0de
commit b159e29
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/.aws/graasp-prod.json b/.aws/graasp-prod.json
@@ -4,6 +4,7 @@
   "cpu": "2048",
   "memory": "4096",
   "requiresCompatibilities": ["FARGATE"],
+  "requiresCompatibilities": ["FARGATE"],
   "networkMode": "awsvpc",
   "runtimePlatform": {
     "operatingSystemFamily": "LINUX",

diff --git a/src/services/item/plugins/folder/controller.test.ts b/src/services/item/plugins/folder/controller.test.ts
@@ -33,7 +33,6 @@ import {
 } from '../../../../utils/errors';
 import { ItemMembership } from '../../../itemMembership/entities/ItemMembership';
 import { saveMember } from '../../../member/test/fixtures/members';
-import { Item } from '../../entities/Item';
 import { ItemTestUtils, expectItem } from '../../test/fixtures/items';
 import { saveUntilMaxDescendants } from '../../test/utils';
 import { ActionItemService } from '../action/service';