| commit | 99321cd538b06f1d809c4d8311e1a9ec1acaa485 | [log] [tgz] |
|---|---|---|
| author | Rucha Mahabal <ruchamahabal2@gmail.com> | Thu Feb 27 13:16:53 2020 +0530 |
| committer | Rucha Mahabal <ruchamahabal2@gmail.com> | Thu Feb 27 13:16:53 2020 +0530 |
| tree | 758e92f7bb0016f152932262763004517dd58e83 | |
| parent | e29d5c1d5ba079f4972d526b2381ec44809e6e12 [diff] [blame] |
fix: conflicts
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py index 1a86b79..439e6a5 100644 --- a/erpnext/setup/utils.py +++ b/erpnext/setup/utils.py
@@ -143,5 +143,5 @@ def welcome_email(): site_name = get_default_company() - title = _("Welcome to {0}".format(site_name)) + title = _("Welcome to {0}").format(site_name) return title