Fixed merge conflict

This commit is contained in:
Nabin Hait
2017-02-27 14:40:53 +05:30
22 changed files with 4591 additions and 4380 deletions

View File

@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
__version__ = '7.2.23'
__version__ = '7.2.24'
def get_default_company(user=None):
'''Get default company for user'''