| commit | 9ea03f371a680f8c120c5bf30f54b99b50244aa6 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@erpnext.com> | Thu Dec 27 18:07:29 2012 +0530 |
| committer | Anand Doshi <anand@erpnext.com> | Thu Dec 27 18:07:29 2012 +0530 |
| tree | 8c95a325fbdcf54a0653446ef986505bbf3f2ab9 | |
| parent | 43eb513a438a4ab97189fa13313f947fe4d1dd8e [diff] |
Merged conflict
diff --git a/patches/patch_list.py b/patches/patch_list.py index 7ff4611..c9a4294 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py
@@ -560,11 +560,11 @@ }, { 'patch_module': 'patches.december_2012', -<<<<<<< HEAD 'patch_file': 'address_title', -======= + }, + { + 'patch_module': 'patches.december_2012', 'patch_file': 'delete_form16_print_format', ->>>>>>> a85b2e4ee349c544acb7a1949351e9a7c70f7b7c }, { 'patch_module': 'patches.december_2012',