resolved conflict while merging with master
This commit is contained in:
@@ -282,4 +282,30 @@ patch_list = [
|
||||
'patch_file': 'change_cacheitem_schema',
|
||||
'description': 'Modified datatype of `value` column from text to longtext'
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.april_2012',
|
||||
'patch_file': 'remove_default_from_rv_detail',
|
||||
'description': ''
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.april_2012',
|
||||
'patch_file': 'update_role_in_address',
|
||||
'description': 'updated roles in address'
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.april_2012',
|
||||
'patch_file': 'update_permlevel_in_address',
|
||||
'description': 'updated permlevel in address'
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.april_2012',
|
||||
'patch_file': 'update_appraisal_permission',
|
||||
'description': 'updated permission in appraisal'
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.april_2012',
|
||||
'patch_file': 'serial_no_fixes',
|
||||
'description': 'fixes for sle creation while import'
|
||||
},
|
||||
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user