From 51d25c3e93786843838c4a9dc7ae38ed0896c335 Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Sun, 16 Jul 2023 09:54:36 -0700 Subject: [PATCH] Fix merge conflict --- front/src/modules/people/components/PeopleCompanyCreateCell.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/modules/people/components/PeopleCompanyCreateCell.tsx b/front/src/modules/people/components/PeopleCompanyCreateCell.tsx index 3222b337b..59f4bc75f 100644 --- a/front/src/modules/people/components/PeopleCompanyCreateCell.tsx +++ b/front/src/modules/people/components/PeopleCompanyCreateCell.tsx @@ -2,7 +2,7 @@ import { useState } from 'react'; import { getOperationName } from '@apollo/client/utilities'; import { v4 } from 'uuid'; -import { GET_COMPANIES } from '@/companies/services'; +import { GET_COMPANIES } from '@/companies/queries'; import { useRecoilScopedState } from '@/recoil-scope/hooks/useRecoilScopedState'; import { relationPickerSearchFilterScopedState } from '@/relation-picker/states/relationPickerSearchFilterScopedState'; import { isCreateModeScopedState } from '@/ui/components/editable-cell/states/isCreateModeScopedState';