Fixed merge conflict

2017-02-27 14:40:53 +05:30
parent c238016aff e0d661f433
commit c642f76a4d
22 changed files with 4591 additions and 4380 deletions
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -28,6 +28,7 @@ after_install = "erpnext.setup.install.after_install"

 boot_session = "erpnext.startup.boot.boot_session"
 notification_config = "erpnext.startup.notifications.get_notification_config"
+get_help_messages = "erpnext.utilities.activation.get_help_messages"

 on_session_creation = "erpnext.shopping_cart.utils.set_cart_count"
 on_logout = "erpnext.shopping_cart.utils.clear_cart_count"