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