nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-05-15 20:42:34 +05:30
committed by GitHub
parent 03b133520b
commit 9b6197ec4a
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/__init__.py
View File

@@ -2,25 +2,7 @@ import inspect
import frappe import frappe
<<<<<<< HEAD
__version__ = "14.0.0-dev" __version__ = "14.0.0-dev"
=======
from erpnext.hooks import regional_overrides
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
__version__ = "13.27.1"
>>>>>>> 096dcf0e54 (chore(release): Bumped to Version 13.27.1)
=======
__version__ = "13.28.0"
>>>>>>> 8cc2ea0ddb (chore(release): Bumped to 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): def get_default_company(user=None):