Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Remove unintended changes

Browse Source 
(cherry picked from commit 5b02b5b3cd98a20a5a07dd83280acd548998ebf0)

# Conflicts:
#	erpnext/__init__.py
This commit is contained in:
Deepesh Garg 2022-05-15 16:42:34 +05:30 committed by Mergify
parent 4ca7a3de4e
commit 03b133520b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/__init__.py
View File

@ -7,6 +7,7 @@ __version__ = "14.0.0-dev"
=======
from erpnext.hooks import regional_overrides
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
__version__ = "13.27.1"
@ -17,6 +18,9 @@ __version__ = "13.28.0"
=======
__version__ = "13.29.0"
>>>>>>> 7369db59aa (chore(release): Bumped to Version 13.29.0)
=======
__version__ = "13.27.0"
>>>>>>> 5b02b5b3cd (chore: Remove unintended changes)
def get_default_company(user=None):