commit e38192cb6d9b80b4a7f86e2485aec07ae10c3391
author Nabin Hait <nabinhait@gmail.com> Tue May 11 11:15:09 2021 +0530
committer Nabin Hait <nabinhait@gmail.com> Tue May 11 11:15:09 2021 +0530
tree d9f7ff559e42a191f7efd399d72d54999629927f
parent ec2ba6bc1f43948d7d16d538ddf9ab3e64256f13
parent d2520680bc2f64d5a4692e63c70b129b2b46a8b7

fix: merge conflict

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index a988d72..6775398 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.2.0'
+__version__ = '13.2.1'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/setup/setup_wizard/operations/install_fixtures.py

diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py
index 5c725d3..7ae81d7 100644
--- a/erpnext/setup/setup_wizard/operations/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py
@@ -428,7 +428,6 @@
 	frappe.local.flags.ignore_update_nsm = True
 	make_records(records[1:])
 	frappe.local.flags.ignore_update_nsm = False
-
 	rebuild_tree("Department", "parent_department")