From 4af814dc3bb31d82f7cbe9f18a122d4be71b8402 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Tue, 19 Aug 2025 11:06:23 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../accounting_dimension_filter.json                     | 9 ---------
 erpnext/patches.txt                                      | 5 -----
 2 files changed, 14 deletions(-)

diff --git a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
index bee30296eed..260bcd11db5 100644
--- a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
+++ b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
@@ -101,11 +101,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-06-07 14:59:41.869117",
-=======
  "modified": "2025-08-08 14:13:22.203011",
->>>>>>> ac2acc535d (fix: add fieldname in accounting dimension filter)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounting Dimension Filter",
@@ -150,12 +146,7 @@
   }
  ],
  "quick_entry": 1,
-<<<<<<< HEAD
- "sort_field": "modified",
-=======
- "row_format": "Dynamic",
  "sort_field": "creation",
->>>>>>> ac2acc535d (fix: add fieldname in accounting dimension filter)
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index aa753e2ba5b..ae52e1e3a09 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -419,10 +419,5 @@ erpnext.patches.v15_0.remove_sales_partner_from_consolidated_sales_invoice
 erpnext.patches.v15_0.repost_gl_entries_with_no_account_subcontracting #2025-08-04
 execute:frappe.db.set_single_value("Accounts Settings", "fetch_valuation_rate_for_internal_transaction", 1)
 erpnext.patches.v15_0.add_company_payment_gateway_account
-<<<<<<< HEAD
 erpnext.patches.v15_0.update_uae_zero_rated_fetch
-=======
-erpnext.patches.v16_0.update_serial_no_reference_name
-erpnext.patches.v16_0.set_invoice_type_in_pos_settings
 erpnext.patches.v15_0.update_fieldname_in_accounting_dimension_filter
->>>>>>> 3cf765d985 (fix: add patch)