From a6b56a4dd7628cded03a78e10648ae113f5acdf7 Mon Sep 17 00:00:00 2001
From: Shllokkk <140623894+Shllokkk@users.noreply.github.com>
Date: Thu, 18 Jun 2026 17:10:12 +0530
Subject: [PATCH] fix: resolving conflicts

---
 .../process_statement_of_accounts.json           | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
index 1384fbfa241..51e8ed9601c 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
@@ -400,21 +400,6 @@
    "fieldtype": "Select",
    "label": "Categorize By",
    "options": "\nCategorize by Voucher\nCategorize by Voucher (Consolidated)"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:(doc.report == 'Accounts Receivable');",
-   "fieldname": "show_future_payments",
-   "fieldtype": "Check",
-   "label": "Show Future Payments"
-  },
-  {
-   "fieldname": "print_format",
-   "fieldtype": "Link",
-   "label": "Print Format",
-   "options": "Print Format"
   },
   {
    "default": "0",
@@ -422,7 +407,6 @@
    "fieldname": "show_opening_entries",
    "fieldtype": "Check",
    "label": "Show Opening Entries"
->>>>>>> d0f1239d2b (fix(accounts): allow process statement of account generation with opening entries)
   }
  ],
  "links": [],