From ca96c24c8d59b05d3e37b27a265337c98fb3aea4 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Tue, 15 Nov 2022 13:57:44 +0530
Subject: [PATCH] chore: Resolve conflicts

---
 erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 147effcc3b3..ceae52044d7 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -2109,11 +2109,7 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
-<<<<<<< HEAD
- "modified": "2022-10-11 13:07:36.488095",
-=======
  "modified": "2022-11-15 09:33:47.870616",
->>>>>>> 9f5d613c78 (fix: Write Off section visibility for non POS Invoices)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",
@@ -2169,4 +2165,4 @@
  "title_field": "title",
  "track_changes": 1,
  "track_seen": 1
-}
\ No newline at end of file
+}