mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-27 02:28:30 +00:00
chore: fix conflicts
This commit is contained in:
@@ -64,7 +64,6 @@
|
||||
"naming_series_prefix",
|
||||
"stock_reservation_tab",
|
||||
"enable_stock_reservation",
|
||||
"auto_reserve_stock",
|
||||
"column_break_rx3e",
|
||||
"allow_partial_reservation",
|
||||
"auto_reserve_stock_for_sales_order_on_purchase",
|
||||
|
||||
Reference in New Issue
Block a user