fix(resolve): fix resolve mismatch conflict path on merge

This commit is contained in:
rstubryan
2025-10-21 15:24:55 +07:00
parent e7e0e308c7
commit 2ab26153fd
9 changed files with 20 additions and 29 deletions
@@ -3,7 +3,7 @@
import { useRouter, useSearchParams } from 'next/navigation';
import useSWR from 'swr';
import RecordingForm from '@/components/pages/flock/recording/form/RecordingForm';
import { RecordingApi } from '@/services/api/flock'; // Import RecordingApi
import { RecordingApi } from '@/services/api/production';
import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
const RecordingEdit = () => {
+1 -1
View File
@@ -3,7 +3,7 @@
import { useRouter, useSearchParams } from 'next/navigation';
import useSWR from 'swr';
import RecordingForm from '@/components/pages/flock/recording/form/RecordingForm';
import { RecordingApi } from '@/services/api/flock';
import { RecordingApi } from '@/services/api/production';
import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
const RecordingDetail = () => {