Fixed conflict

2016-05-26 16:10:02 +05:30
parent 8ed2f87480 1c383c3664
commit 310d64d565
6 changed files with 16 additions and 12 deletions
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -20,7 +20,7 @@ def setup_complete(args=None):

 	install_fixtures.install(args.get("country"))

-	# update_setup_wizard_access()
+	update_setup_wizard_access()
 	create_fiscal_year_and_company(args)
 	create_users(args)
 	set_defaults(args)