nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 03:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged conflict

Browse Source
This commit is contained in:
Anand Doshi
2012-12-27 18:07:29 +05:30
parent 43eb513a43
commit 9ea03f371a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/patch_list.py
View File

@@ -560,11 +560,11 @@ patch_list = [
}, },
{ {
'patch_module': 'patches.december_2012', 'patch_module': 'patches.december_2012',
<<<<<<< HEAD
'patch_file': 'address_title', 'patch_file': 'address_title',
======= },
{
'patch_module': 'patches.december_2012',
'patch_file': 'delete_form16_print_format', 'patch_file': 'delete_form16_print_format',
>>>>>>> a85b2e4ee349c544acb7a1949351e9a7c70f7b7c
}, },
{ {
'patch_module': 'patches.december_2012', 'patch_module': 'patches.december_2012',