From 35230a969256ca2c98ad3f5940ba6775b5345774 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Wed, 24 Apr 2024 11:33:34 +0530
Subject: [PATCH] chore: Resolve conflicts

---
 .../lower_deduction_certificate.json                     | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json b/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
index 044471a86e3..b94cfe673b6 100644
--- a/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
+++ b/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
@@ -135,20 +135,12 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-04-18 08:25:35.302081",
-=======
  "modified": "2024-04-18 15:25:25.808355",
->>>>>>> f6f118855b (fix: Permission for lower dedcution certificate)
  "modified_by": "Administrator",
  "module": "Regional",
  "name": "Lower Deduction Certificate",
  "naming_rule": "By fieldname",
  "owner": "Administrator",
-<<<<<<< HEAD
- "permissions": [],
- "sort_field": "modified",
-=======
  "permissions": [
   {
    "create": 1,
@@ -188,7 +180,6 @@
   }
  ],
  "sort_field": "creation",
->>>>>>> f6f118855b (fix: Permission for lower dedcution certificate)
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1