| commit | 4cad7fc36c5036a670cc036eba2327f02403f9ce | [log] [tgz] |
|---|---|---|
| author | Nabin Hait <nabinhait@gmail.com> | Thu Dec 07 12:04:19 2017 +0530 |
| committer | Nabin Hait <nabinhait@gmail.com> | Thu Dec 07 12:04:19 2017 +0530 |
| tree | 222dc6fadbcf4f73a35f74f389e2c965906040a1 | |
| parent | e0d461c2eb9e4d752fa44aa2f7f3b397161d0bec [diff] | |
| parent | 84a44f7758cbdcc12a6289f36e5fc2c83dc5afc7 [diff] |
Fixed Merge conflict
diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 29e81f1..3394124 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@ from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '9.2.20' +__version__ = '9.2.21' def get_default_company(user=None): '''Get default company for user'''