chore: fix conflicts

This commit is contained in:
rohitwaghchaure
2026-02-23 11:26:31 +05:30
committed by GitHub
parent 9a2eb91eec
commit 8cd12e37cd

View File

@@ -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",