resolved merge conflicts

This commit is contained in:
mbauskar 2017-08-29 20:41:59 +05:30
commit a896e52489

View File

@ -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'''