From 6cd9e904c361152e04aa4083bd1374f666afb8ac Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Mon, 23 Mar 2026 22:27:30 +0530
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/projects/doctype/project/project.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index c376ebcbdf4..6a598733d65 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -1,10 +1,6 @@
 # Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 91da450a31 (chore: remove unused imports (#53722))
 import frappe
 from email_reply_parser import EmailReplyParser
 from frappe import _, qb