From 24709ab4007c1f2d29abe350386e483842a1eea3 Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Mon, 8 Apr 2024 15:50:58 +0530
Subject: [PATCH] chore: fix conflict

---
 erpnext/hooks.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 68340f9f68a..fdaae5cc7e4 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -643,15 +643,5 @@ extend_bootinfo = [
 	"erpnext.support.doctype.service_level_agreement.service_level_agreement.add_sla_doctypes",
 	"erpnext.startup.boot.bootinfo",
 ]
-<<<<<<< HEAD
-=======
-
-
-default_log_clearing_doctypes = {
-	"Repost Item Valuation": 60,
-}
-
-export_python_type_annotations = True
 
 fields_for_group_similar_items = ["qty", "amount"]
->>>>>>> f7c9e1538b (feat: new hook `fields_for_group_similar_items` to group additional fields for print formats (#40831))