commit 7590650a735c1785953276bce410cb377b81a509
author Rushabh Mehta <rmehta@gmail.com> Wed Jan 02 16:46:01 2013 +0530
committer Rushabh Mehta <rmehta@gmail.com> Wed Jan 02 16:46:01 2013 +0530
tree afd0372101e7befd8bcc79f114f1c99cf3f66f1a
parent 3a509befdb64b3a8326c5192697b7d0e0a4ab4ef

patch_list merge

patches/patch_list.py

diff --git a/patches/patch_list.py b/patches/patch_list.py
index 778f6fc..08f0253 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -568,19 +568,10 @@
 	},
 	{
 		'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
 ]
\ No newline at end of file