fixed merge conflict

2012-10-01 11:04:05 +05:30 · 2012-10-01 11:04:05 +05:30 · 1e6989c3a5
commit 1e6989c3a5
parent 5b553b2709
1 changed files with 3 additions and 3 deletions
--- 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
 	},
 ]