Fixed Merge conflict

This commit is contained in:
Nabin Hait 2017-12-07 12:04:19 +05:30
commit 4cad7fc36c

View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
__version__ = '9.2.20'
__version__ = '9.2.21'
def get_default_company(user=None):
'''Get default company for user'''