From 12f027b3f48069c17f85acb562e5cfa48940886a Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Mon, 20 Nov 2023 14:15:03 +0530
Subject: [PATCH] chore: resolve conflict

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

diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
index 83b025e594c..de333cb9e8d 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
@@ -1562,11 +1562,7 @@
  "icon": "fa fa-file-text",
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-09-30 03:49:50.455199",
-=======
  "modified": "2023-11-20 12:27:12.848149",
->>>>>>> 83a13e22b7 (refactor: add flag to POS Invoice)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice",