From 0e3788e34656fc0d41cf47161282aace4ec2591a Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 11 Feb 2022 21:27:44 +0530 Subject: [PATCH] fix: conflicts --- .../leave_policy_assignment/leave_policy_assignment.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py b/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py index b70b59fe1b0..6e6943f71aa 100644 --- a/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py +++ b/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py @@ -8,12 +8,8 @@ from math import ceil import frappe from frappe import _, bold from frappe.model.document import Document -<<<<<<< HEAD -from frappe.utils import date_diff, flt, formatdate, get_datetime, get_last_day, getdate -from six import string_types -======= from frappe.utils import date_diff, flt, formatdate, get_last_day, getdate ->>>>>>> c7be9ef5d2 (fix: consider leaves for past months if assignment is based on joining date too) +from six import string_types class LeavePolicyAssignment(Document):