fixed conflict
This commit is contained in:
@@ -452,6 +452,11 @@ patch_list = [
|
||||
'patch_file': 'alter_tabsessions',
|
||||
'description': "alter tabsessions to change user column definition"
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.june_2012',
|
||||
'patch_file': 'delete_old_parent_entries',
|
||||
'description': "delete entries of child table having parent like old_par%% or ''"
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.april_2012',
|
||||
'patch_file': 'delete_about_contact',
|
||||
@@ -467,9 +472,14 @@ patch_list = [
|
||||
'patch_file': 'reload_pr_po_mapper',
|
||||
'description': "order date should be greater than equal to request date"
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.july_2012',
|
||||
'patch_file': 'address_contact_perms',
|
||||
'description': "sync address contact perms"
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.july_2012',
|
||||
'patch_file': 'packing_list_cleanup_and_serial_no',
|
||||
'description': "packing list cleanup and serial no status update"
|
||||
},
|
||||
},
|
||||
]
|
||||
Reference in New Issue
Block a user