mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-27 02:28:30 +00:00
resolved merge conflicts
This commit is contained in:
@@ -4,7 +4,7 @@ import inspect
|
||||
import frappe
|
||||
from erpnext.hooks import regional_overrides
|
||||
|
||||
__version__ = '8.9.2'
|
||||
__version__ = '8.10.0'
|
||||
|
||||
def get_default_company(user=None):
|
||||
'''Get default company for user'''
|
||||
|
||||
Reference in New Issue
Block a user