From e7e0e308c78b07ee8e4e8d8b52e47fc15f5a6679 Mon Sep 17 00:00:00 2001 From: rstubryan Date: Tue, 21 Oct 2025 15:20:15 +0700 Subject: [PATCH] fix(resolve): fix resolve mismatch conflict path on merge --- .../pages/flock/recording/form/RecordingForm.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/pages/flock/recording/form/RecordingForm.tsx b/src/components/pages/flock/recording/form/RecordingForm.tsx index 78a4436a..aa866c81 100644 --- a/src/components/pages/flock/recording/form/RecordingForm.tsx +++ b/src/components/pages/flock/recording/form/RecordingForm.tsx @@ -553,7 +553,11 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { return ( <>
- +
{ formik={formik} editUrl={ initialValues - ? `/flock/recording/detail/edit/?recordingId=${initialValues.id}` + ? `/production/recording/detail/edit/?recordingId=${initialValues.id}` : undefined } onDelete={deleteRecordingClickHandler}