From 6c10783823bc9adbea25c9cd76a46d64867eac17 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Wed, 17 Apr 2024 11:47:52 +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 b1688eabe01..51da848d9da 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -2187,11 +2187,7 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
-<<<<<<< HEAD
- "modified": "2024-03-22 17:50:34.395602",
-=======
  "modified": "2024-04-11 11:30:26.272441",
->>>>>>> c3845ac0f1 (fix: Allow updating cost center and project for repostable doctypes)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",
@@ -2246,4 +2242,4 @@
  "title_field": "title",
  "track_changes": 1,
  "track_seen": 1
-}
\ No newline at end of file
+}