From b8ef83e1ea2473024a18ef49fbb3d2316f5f0fc7 Mon Sep 17 00:00:00 2001
From: Diptanil Saha <diptanil@frappe.io>
Date: Wed, 9 Apr 2025 15:39:15 +0530
Subject: [PATCH] chore: resolve conflict

---
 erpnext/accounts/doctype/pos_profile/pos_profile.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index 1d7a962cf1f..e74fd72d9e5 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -451,12 +451,8 @@
    "role": "Accounts User"
   }
  ],
-<<<<<<< HEAD
- "sort_field": "modified",
-=======
  "row_format": "Dynamic",
  "sort_field": "creation",
->>>>>>> 821d64241a (fix: added missing project field on pos profile)
  "sort_order": "DESC",
  "states": []
 }