From a5e8e449eea1266b225d1616b0b400cd51feeb01 Mon Sep 17 00:00:00 2001
From: hasnain2808 <hasnain2808@gmail.com>
Date: Mon, 28 Sep 2020 20:43:03 +0530
Subject: [PATCH] chore: Merge branch 'develop' into UAE-VAT-Format

---
 erpnext/accounts/desk_page/accounting/accounting.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/desk_page/accounting/accounting.json b/erpnext/accounts/desk_page/accounting/accounting.json
index 29d1331b5d..85635572b1 100644
--- a/erpnext/accounts/desk_page/accounting/accounting.json
+++ b/erpnext/accounts/desk_page/accounting/accounting.json
@@ -103,11 +103,7 @@
  "idx": 0,
  "is_standard": 1,
  "label": "Accounting",
-<<<<<<< HEAD
  "modified": "2020-09-28 13:19:27.703992",
-=======
- "modified": "2020-09-09 11:45:33.766400",
->>>>>>> develop
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounting",