fixed conflict

This commit is contained in:
Nabin Hait
2012-12-13 18:39:08 +05:30
3 changed files with 14 additions and 1 deletions

View File

@@ -733,6 +733,10 @@ patch_list = [
'patch_module': 'patches.december_2012',
'patch_file': 'fix_default_print_format',
},
{
'patch_module': 'patches.december_2012',
'patch_file': 'file_list_rename',
},
{
'patch_module': 'patches.december_2012',
'patch_file': 'replace_createlocal',