fix: conflicts
This commit is contained in:
@@ -9,6 +9,7 @@ import frappe
|
|||||||
from frappe import _, bold
|
from frappe import _, bold
|
||||||
from frappe.model.document import Document
|
from frappe.model.document import Document
|
||||||
from frappe.utils import date_diff, flt, formatdate, get_datetime, get_last_day, getdate
|
from frappe.utils import date_diff, flt, formatdate, get_datetime, get_last_day, getdate
|
||||||
|
from six import string_types
|
||||||
|
|
||||||
|
|
||||||
class LeavePolicyAssignment(Document):
|
class LeavePolicyAssignment(Document):
|
||||||
|
|||||||
Reference in New Issue
Block a user