commit 7b596d8d8883cbcb7b419b8b4af6ca691bf78172
author Nabin Hait <nabinhait@gmail.com> Mon Apr 29 14:37:38 2013 +0530
committer Nabin Hait <nabinhait@gmail.com> Mon Apr 29 14:37:38 2013 +0530
tree 022489a28f2a1ad5e8d7767c5d0502b5111855fe
parent 345c8fbfa29dd51e7f0a637ec50818dd7b975b16
parent 7bd7c8769ef6eb472b9b0dde5653859ccaa7150d

fixed conflict

patches/april_2013/rebuild_sales_browser.py

diff --git a/patches/april_2013/rebuild_sales_browser.py b/patches/april_2013/rebuild_sales_browser.py
new file mode 100644
index 0000000..917ae68
--- /dev/null
+++ b/patches/april_2013/rebuild_sales_browser.py
@@ -0,0 +1,4 @@
+import webnotes
+def execute():
+	from patches.january_2013 import rebuild_tree
+	rebuild_tree.execute()
\ No newline at end of file

patches/patch_list.py

diff --git a/patches/patch_list.py b/patches/patch_list.py
index 096fec80..9bc9a2d 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -248,4 +248,5 @@
 	"patches.april_2013.p06_default_cost_center",
 	"execute:webnotes.reset_perms('File Data')",
 	"patches.april_2013.p07_update_file_data_custom_field",
+	"patches.april_2013.rebuild_sales_browser",
 ]
\ No newline at end of file