| commit | 0c9a262de4efecc6686d4ab96db4d8ba9973c3a9 | [log] [tgz] |
|---|---|---|
| author | Nabin Hait <nabinhait@gmail.com> | Fri Jul 13 10:39:45 2012 +0530 |
| committer | Nabin Hait <nabinhait@gmail.com> | Fri Jul 13 10:39:45 2012 +0530 |
| tree | d56e9dca6124ac39da49daa0e9ae40e99adda5af | |
| parent | 91223d325bb8e81d315bc9a400f07969f601a4a7 [diff] | |
| parent | 158e7751a86834ffff3a6e5306fbcca08d1bea1f [diff] |
fixed conflict
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py index 6f462a4..32e1a6e 100644 --- a/erpnext/patches/patch_list.py +++ b/erpnext/patches/patch_list.py
@@ -492,8 +492,7 @@ 'patch_file': 'update_purchase_tax', 'description': "rename options in purchase taxes and charges" }, - { - 'patch_module': 'patches.june_2012', + { 'patch_module': 'patches.june_2012', 'patch_file': 'cms2', 'description': 'cms2 release patches' },