Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
Anand Doshi 2012-10-01 11:04:05 +05:30
parent 5b553b2709
commit 1e6989c3a5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/patches/patch_list.py
View File

@ -601,10 +601,10 @@ patch_list = [
}, },
{ {
'patch_module': 'patches.september_2012', 'patch_module': 'patches.september_2012',
<<<<<<< Updated upstream
'patch_file': 'deprecate_account_balance', 'patch_file': 'deprecate_account_balance',
======= },
{
'patch_module': 'patches.september_2012',
'patch_file': 'profile_delete_permission', 'patch_file': 'profile_delete_permission',
>>>>>>> Stashed changes
}, },
] ]