From 446a8fe096cab70370a88799405217d8bd06187a Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Wed, 5 Mar 2025 13:08:47 +0530
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/support/doctype/issue/issue.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index c048eb1d5cd..622e19e9e3a 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -391,11 +391,7 @@
  "icon": "fa fa-ticket",
  "idx": 7,
  "links": [],
-<<<<<<< HEAD
- "modified": "2021-11-24 13:13:10.276630",
-=======
  "modified": "2025-02-18 21:18:52.797745",
->>>>>>> 019303dd12 (fix: tests)
  "modified_by": "Administrator",
  "module": "Support",
  "name": "Issue",
@@ -424,4 +420,4 @@
  "title_field": "subject",
  "track_changes": 1,
  "track_seen": 1
-}
\ No newline at end of file
+}