mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-24 15:39:20 +00:00
fixed conflict
This commit is contained in:
@@ -159,4 +159,5 @@ patch_list = [
|
||||
"patches.january_2013.remove_unwanted_permission",
|
||||
"patches.january_2013.remove_landed_cost_master",
|
||||
"patches.january_2013.reload_print_format",
|
||||
"patches.january_2013.rebuild_tree",
|
||||
]
|
||||
Reference in New Issue
Block a user