From 1d1af26f7a286c4e2c2ded42a91e6e674836f383 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 24 Nov 2023 11:54:55 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/projects/doctype/project/project.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index f279cf17d72..748c755d377 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -7,11 +7,7 @@ from email_reply_parser import EmailReplyParser from frappe import _, qb from frappe.desk.reportview import get_match_cond from frappe.model.document import Document -<<<<<<< HEAD -======= -from frappe.query_builder import Interval -from frappe.query_builder.functions import Count, CurDate, Date, Sum, UnixTimestamp ->>>>>>> bcbe6c4a53 (refactor: provide UI button to recalculate when needed) +from frappe.query_builder.functions import Sum from frappe.utils import add_days, flt, get_datetime, get_time, get_url, nowtime, today from erpnext import get_default_company