fixes to valid elements
This commit is contained in:
commit
1a76f67116
@ -576,10 +576,19 @@ patch_list = [
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.january_2013',
|
||||
<<<<<<< HEAD
|
||||
'patch_file': 'remove_bad_permissions',
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.january_2013',
|
||||
'patch_file': 'deprecate_stock_search_criteria',
|
||||
},
|
||||
=======
|
||||
'patch_file': 'deprecate_stock_search_criteria',
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.january_2013',
|
||||
'patch_file': 'remove_bad_permissions',
|
||||
},
|
||||
>>>>>>> 93a02a3995e93ec0915d99ecfeabf456b65591b4
|
||||
]
|
Loading…
x
Reference in New Issue
Block a user