From 2293696ab40b29efacc5328427d3eadd5d817794 Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Thu, 23 Nov 2023 15:10:29 +0100
Subject: [PATCH] chore: resolve conflicts

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

diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json
index f4fd0d1ef52..bd43fb77c23 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -739,10 +739,6 @@
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
-<<<<<<< HEAD
- "links": [],
- "modified": "2023-06-19 11:38:04.387219",
-=======
  "links": [
   {
    "is_child_table": 1,
@@ -753,7 +749,6 @@
   }
  ],
  "modified": "2023-11-23 12:07:20.887885",
->>>>>>> 3be345e605 (feat: add Bank Transaction to connections in Journal and Payment Entry (#38297))
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry",
@@ -799,4 +794,4 @@
  "states": [],
  "title_field": "title",
  "track_changes": 1
-}
\ No newline at end of file
+}