From 927cd173cff1fc105bcc7e84234d6794974af0b9 Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Sun, 15 Aug 2021 18:47:51 +0200
Subject: [PATCH] fix: typo

(cherry picked from commit 0f2f11cb33fa3911b85d22676e2b2c0c87fdbdf3)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
---
 erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 5cf4ad362aa..01baf452942 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -2229,11 +2229,15 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
+<<<<<<< HEAD
 <<<<<<< HEAD
  "modified": "2025-02-06 15:59:54.636202",
 =======
  "modified": "2021-08-02 18:36:51.978581",
 >>>>>>> b57521a337 (feat: add `total_billing_hours` to Sales Invoice)
+=======
+ "modified": "2021-08-15 18:40:20.445127",
+>>>>>>> 0f2f11cb33 (fix: typo)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",
@@ -2288,4 +2292,4 @@
  "title_field": "customer_name",
  "track_changes": 1,
  "track_seen": 1
-}
\ No newline at end of file
+}