commit a5e8e449eea1266b225d1616b0b400cd51feeb01
author hasnain2808 <hasnain2808@gmail.com> Mon Sep 28 20:43:03 2020 +0530
committer hasnain2808 <hasnain2808@gmail.com> Mon Sep 28 20:43:03 2020 +0530
tree b5692a306270ba793d983d21eb887524ced8fae7
parent 23c8966e818fd07e26010e5548e1cb5128e4ae10

chore: Merge branch 'develop' into UAE-VAT-Format

erpnext/accounts/desk_page/accounting/accounting.json

diff --git a/erpnext/accounts/desk_page/accounting/accounting.json b/erpnext/accounts/desk_page/accounting/accounting.json
index 29d1331..8563557 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",