Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patch_list merge

Browse Source
This commit is contained in:
Rushabh Mehta 2013-01-02 16:46:01 +05:30
parent 3a509befdb
commit 7590650a73
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
patches/patch_list.py
View File

@ -568,19 +568,10 @@ patch_list = [
}, },
{ {
'patch_module': 'patches.january_2013', 'patch_module': 'patches.january_2013',
<<<<<<< HEAD
'patch_file': 'remove_bad_permissions', 'patch_file': 'remove_bad_permissions',
}, },
{ {
'patch_module': 'patches.january_2013', 'patch_module': 'patches.january_2013',
'patch_file': 'deprecate_stock_search_criteria', 'patch_file': 'deprecate_stock_search_criteria',
}, },
=======
'patch_file': 'deprecate_stock_search_criteria',
},
{
'patch_module': 'patches.january_2013',
'patch_file': 'remove_bad_permissions',
},
>>>>>>> 93a02a3995e93ec0915d99ecfeabf456b65591b4
] ]