chore: fix conflicts

Removed fields related to parallel reposting and column breaks, and updated the modified date.

erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json

@@ -14,16 +14,7 @@
   "end_time",
   "limits_dont_apply_on",
   "item_based_reposting",
-<<<<<<< HEAD
-=======
-  "column_break_mavd",
   "do_not_fetch_incoming_rate_from_serial_no",
-  "section_break_dxuf",
-  "enable_parallel_reposting",
-  "no_of_parallel_reposting",
-  "column_break_itvd",
-  "enable_separate_reposting_for_gl",
->>>>>>> 2773b7c002 (fix: incoming rate for legacy serial no)
   "errors_notification_section",
   "notify_reposting_error_to_role"
  ],
@@ -76,41 +67,6 @@
    "fieldname": "errors_notification_section",
    "fieldtype": "Section Break",
    "label": "Errors Notification"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "default": "0",
-   "depends_on": "eval: doc.item_based_reposting",
-   "fieldname": "enable_parallel_reposting",
-   "fieldtype": "Check",
-   "label": "Enable Parallel Reposting"
-  },
-  {
-   "default": "4",
-   "depends_on": "eval: doc.item_based_reposting === 1 && doc.enable_parallel_reposting === 1",
-   "fieldname": "no_of_parallel_reposting",
-   "fieldtype": "Int",
-   "label": "No of Parallel Reposting (Per Item)"
-  },
-  {
-   "fieldname": "section_break_dxuf",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "column_break_itvd",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "depends_on": "item_based_reposting",
-   "fieldname": "enable_separate_reposting_for_gl",
-   "fieldtype": "Check",
-   "label": "Enable Separate Reposting for GL"
-  },
-  {
-   "fieldname": "column_break_mavd",
-   "fieldtype": "Column Break"
   },
   {
    "default": "0",
@@ -118,17 +74,12 @@
    "fieldname": "do_not_fetch_incoming_rate_from_serial_no",
    "fieldtype": "Check",
    "label": "Do not fetch incoming rate from Serial No"
->>>>>>> 2773b7c002 (fix: incoming rate for legacy serial no)
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2025-07-08 11:27:46.659056",
-=======
  "modified": "2026-05-15 12:59:34.392491",
->>>>>>> 2773b7c002 (fix: incoming rate for legacy serial no)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Reposting Settings",