commit | 2535fe9b1e725cbfa4e92fc2e80c9cf8ce9e425e | [log] [tgz] |
---|---|---|
author | Nabin Hait <nabinhait@gmail.com> | Wed Apr 14 13:09:50 2021 +0530 |
committer | Nabin Hait <nabinhait@gmail.com> | Wed Apr 14 13:09:50 2021 +0530 |
tree | 4ed17df663031b3b81b0a05f15104e3f37138273 | |
parent | 3f6ba123448cecd25b4cfbe1eb77b5b036e48c2d [diff] [blame] | |
parent | b77793763a50453e3d13fb065d6fe72fd6e41d8f [diff] [blame] |
fix: Resolved merge conflict
diff --git a/erpnext/__init__.py b/erpnext/__init__.py index d2e5870..199a183 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__ = '13.0.1' +__version__ = '13.0.0-dev' def get_default_company(user=None): '''Get default company for user'''