nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Remove unintended changes

Browse Source 
(cherry picked from commit 5b02b5b3cd)

# 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
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 from erpnext.hooks import regional_overrides
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
__version__ = "13.27.1" __version__ = "13.27.1"
@@ -17,6 +18,9 @@ __version__ = "13.28.0"
======= =======
__version__ = "13.29.0" __version__ = "13.29.0"
>>>>>>> 7369db59aa (chore(release): Bumped to 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): def get_default_company(user=None):