From a292e52b34aa24ef0ad055d91bd720a410720c95 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Fri, 26 Apr 2024 13:47:03 +0530
Subject: [PATCH] chore: fix conflicts

---
 .../stock_reposting_settings/stock_reposting_settings.json  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json b/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
index 6da3b4d5c8e..cbbb0ce0990 100644
--- a/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
+++ b/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
@@ -77,11 +77,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-11-01 16:14:29.080697",
-=======
  "modified": "2024-04-24 12:19:40.204888",
->>>>>>> aefbe21b46 (feat: allow to do reposting for all transactions (audit))
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Reposting Settings",
@@ -102,4 +98,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
\ No newline at end of file
+}