From 1ccf30d97b2c8b92346bb3d73d4adbad6ab4b621 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Fri, 17 Jan 2025 14:38:03 +0100
Subject: [PATCH] chore: resolve confilcts

---
 erpnext/projects/doctype/project/project.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index c88dc3780d0..6ea98c1baf5 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -7,15 +7,8 @@ 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.functions import Sum
-from frappe.utils import add_days, flt, get_datetime, get_time, get_url, nowtime, today
-=======
-from frappe.query_builder import Interval
-from frappe.query_builder.functions import Count, CurDate, Date, Sum, UnixTimestamp
-from frappe.utils import add_days, flt, get_datetime, get_link_to_form, get_time, get_url, nowtime, today
-from frappe.utils.user import is_website_user
->>>>>>> 8d66142865 (fix(Project): re-phrase welcome email (#45175))
+from frappe.utils import add_days, flt, get_datetime, get_link_to_form, get_time, nowtime, today
 
 from erpnext import get_default_company
 from erpnext.controllers.queries import get_filters_cond