From 1e6989c3a582f281adedb01012cefd90f08fcf3f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 1 Oct 2012 11:04:05 +0530 Subject: [PATCH] fixed merge conflict --- erpnext/patches/patch_list.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py index 1325a6ecca..da8fee392a 100644 --- a/erpnext/patches/patch_list.py +++ b/erpnext/patches/patch_list.py @@ -601,10 +601,10 @@ patch_list = [ }, { 'patch_module': 'patches.september_2012', -<<<<<<< Updated upstream 'patch_file': 'deprecate_account_balance', -======= + }, + { + 'patch_module': 'patches.september_2012', 'patch_file': 'profile_delete_permission', ->>>>>>> Stashed changes }, ]