From e0784eb593e8e443e1fab231eb5363790ab3449f Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Wed, 31 Jul 2024 17:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=B7=E6=A0=BC=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/products/Detail/ProductInfoForm.jsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/views/products/Detail/ProductInfoForm.jsx b/src/views/products/Detail/ProductInfoForm.jsx
index 7bd56e4..abe4242 100644
--- a/src/views/products/Detail/ProductInfoForm.jsx
+++ b/src/views/products/Detail/ProductInfoForm.jsx
@@ -92,13 +92,7 @@ const InfoForm = ({ formInstance, onSubmit, onReset, onValuesChange, editable, s
           )} */}
         </Row>
         {/* <Divider className='my-1' /> */}
-
-<<<<<<< HEAD
-        <ProductInfoLgc editable={editable} formInstance={form} />
-=======
         <ProductInfoLgc editable={editable} ignoreEditable={ignoreEditable} formInstance={form} />
-        <ProductInfoQuotation editable={editable} formInstance={form} />
->>>>>>> ab527e36c27b7e3d4f344c30675a93729ef7cf3c
 
         <Form.Item hidden name={'id'} label={'ID'}>
           <Input />