mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-03 13:38:27 +00:00
chore: fix conflicts
This commit is contained in:
@@ -11,12 +11,12 @@
|
|||||||
"engine": "InnoDB",
|
"engine": "InnoDB",
|
||||||
"field_order": [
|
"field_order": [
|
||||||
"naming_series",
|
"naming_series",
|
||||||
|
"supplier_type",
|
||||||
"supplier_name",
|
"supplier_name",
|
||||||
"gender",
|
"gender",
|
||||||
"column_break0",
|
"column_break0",
|
||||||
"supplier_group",
|
"supplier_group",
|
||||||
"country",
|
"country",
|
||||||
"supplier_type",
|
|
||||||
"is_transporter",
|
"is_transporter",
|
||||||
"image",
|
"image",
|
||||||
"defaults_section",
|
"defaults_section",
|
||||||
|
|||||||
Reference in New Issue
Block a user