From 0d8b3a485a50adac0648b8c3f21e895a2735175a Mon Sep 17 00:00:00 2001
From: "Nihantra C. Patel" <141945075+Nihantra-Patel@users.noreply.github.com>
Date: Thu, 2 Jul 2026 10:30:58 +0530
Subject: [PATCH] fix: resolved conflicts

Removed outdated check for freezing date in general ledger validation.
---
 erpnext/accounts/general_ledger.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index 40afcc1832d..fc61e82a587 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -697,10 +697,6 @@ def make_reverse_gl_entries(
 			partial_cancel=partial_cancel,
 		)
 		validate_accounting_period(gl_entries)
-<<<<<<< HEAD
-		check_freezing_date(gl_entries[0]["posting_date"], adv_adj)
-=======
->>>>>>> cab1b129c0 (fix: validate reverse GL entries on current date under immutable ledger (#56709))
 
 		is_opening = any(d.get("is_opening") == "Yes" for d in gl_entries)