From 9ea03f371a680f8c120c5bf30f54b99b50244aa6 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 27 Dec 2012 18:07:29 +0530 Subject: [PATCH] Merged conflict --- patches/patch_list.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/patch_list.py b/patches/patch_list.py index 7ff4611e58..c9a4294bfb 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -560,11 +560,11 @@ patch_list = [ }, { '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',