Fakultas Ilmu Komputer UI

Commit 9c52889e authored by FadhilP's avatar FadhilP
Browse files

[REFACTOR] resolve merge conflict

parent f5df2ccf
Pipeline #70332 passed with stages
in 3 minutes and 34 seconds
......@@ -23,14 +23,7 @@ const FormProduk = ({ onSubmit, initialData = null }) => {
description: initialData["description"],
price: initialData["price"].split(".")[0],
stock: initialData["stock"],
<<<<<<< HEAD
<<<<<<< HEAD
=======
unit: initialData["unit"],
>>>>>>> b6ec26d614d91777b867598e93fdf8c02059cab0
=======
unit: initialData["unit"],
>>>>>>> 5b3b6c2c70591b25af9bbbe4181205109a545e55
modal: initialData["modal"].split(".")[0],
}
: {},
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment