Deepesh Garg 293ec00023 chore: Resolve conflicts ...

(cherry picked from commit aa16a4bb5f)

# Conflicts:
#	erpnext/patches.txt

2022-02-01 12:42:09 +00:00

..

doctype

chore: Resolve conflicts

2022-02-01 12:42:09 +00:00

page

chore: remove __future__ py2 compatibility imports

2021-11-25 17:42:24 +05:30

setup_wizard

chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release'

2022-01-18 00:01:14 +05:30

workspace

fix: workspace links to ecommerce settings (#28360)

2021-11-12 10:54:31 +05:30

__init__.py

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30

default_energy_point_rules.py

chore: remove __future__ py2 compatibility imports

2021-11-25 17:42:24 +05:30

default_success_action.py

chore: remove __future__ py2 compatibility imports

2021-11-25 17:42:24 +05:30

install.py

chore: remove __future__ py2 compatibility imports

2021-11-25 17:42:24 +05:30

utils.py

test: set customer group and territory defaults

2021-12-06 12:12:35 +05:30