From 736b125e1445a20e069d80d454126e1126559108 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Sat, 22 Mar 2025 20:49:56 +0530
Subject: [PATCH] chore: fix conflicts

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

diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index 7aa67a9e1ce..f6d36b94e35 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -259,11 +259,7 @@
  "idx": 1,
  "in_create": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-03-19 18:30:49.613401",
-=======
  "modified": "2025-03-21 15:29:11.221890",
->>>>>>> 92be7cbbbf (perf: timeout while renaming cost center)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "GL Entry",
@@ -297,4 +293,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
\ No newline at end of file
+}