Hot Fix merge conflicts (#523)

2023-07-05 16:58:47 +02:00
parent 2961fed932
commit 3db15929a5
6 changed files with 17 additions and 8 deletions
--- a/front/src/modules/comments/components/CommentThreadRelationPicker.tsx
+++ b/front/src/modules/comments/components/CommentThreadRelationPicker.tsx
@ -231,6 +231,7 @@ export function CommentThreadRelationPicker({ commentThread }: OwnProps) {
              entitiesToSelect,
              filteredSelectedEntities,
              selectedEntities,
+              loading: false, // TODO implement skeleton loading
            }}
            onItemCheckChange={handleCheckItemChange}
            onSearchFilterChange={handleFilterChange}