Fakultas Ilmu Komputer UI
Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ppl-fasilkom-ui
PPL Sosial
pilar
pilar-web
Commits
d7c5fa9e
Commit
d7c5fa9e
authored
Apr 08, 2021
by
FadhilP
Browse files
[REFACTOR] fix merge conflict
parent
35476649
Pipeline
#70331
passed with stages
in 3 minutes and 25 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/page/produk/FormProduk.jsx
View file @
d7c5fa9e
...
...
@@ -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
],
}
:
{},
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment