From 56f3983f2d05f182fbc0c75d19b0482bf027eb90 Mon Sep 17 00:00:00 2001
From: Diptanil Saha <diptanil@frappe.io>
Date: Wed, 29 Jul 2026 04:35:16 +0530
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/patches.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 014d297a054..e5258222013 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -494,8 +494,4 @@ erpnext.patches.v16_0.access_control_for_project_users
 erpnext.patches.v16_0.enable_book_stock_expense_gl_entries
 erpnext.patches.v16_0.rename_ar_ap_ageing_filter
 erpnext.patches.v16_0.fix_subcontracting_titles
-<<<<<<< HEAD
-=======
-erpnext.patches.v16_0.move_warehouse_defaults_to_company
 erpnext.patches.v16_0.backfill_repost_accounting_ledger_status
->>>>>>> 372dff2ffa (refactor(accounts): repost accounting ledger (#56442))