| commit | 1e6989c3a582f281adedb01012cefd90f08fcf3f | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@iwebnotes.com> | Mon Oct 01 11:04:05 2012 +0530 |
| committer | Anand Doshi <anand@iwebnotes.com> | Mon Oct 01 11:04:05 2012 +0530 |
| tree | 103b8f716036efd30132693291a08b531f212660 | |
| parent | 5b553b27091646e9babbf3efb144ec6797da6895 [diff] |
fixed merge conflict
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py index 1325a6e..da8fee3 100644 --- a/erpnext/patches/patch_list.py +++ b/erpnext/patches/patch_list.py
@@ -601,10 +601,10 @@ }, { 'patch_module': 'patches.september_2012', -<<<<<<< Updated upstream 'patch_file': 'deprecate_account_balance', -======= + }, + { + 'patch_module': 'patches.september_2012', 'patch_file': 'profile_delete_permission', ->>>>>>> Stashed changes }, ]