From 4ede3a9ba593fc5b3f961f8e854ef67207c88ba9 Mon Sep 17 00:00:00 2001
From: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Date: Wed, 20 Mar 2024 19:57:24 +0530
Subject: [PATCH] chore: resolve conflicts

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

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index b57a887d900..8f4b035361a 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -1275,11 +1275,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-10-01 20:58:07.851037",
-=======
  "modified": "2024-03-20 16:03:31.611808",
->>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Order",
@@ -1334,4 +1330,4 @@
  "timeline_field": "supplier",
  "title_field": "supplier_name",
  "track_changes": 1
-}
\ No newline at end of file
+}