fix: syntax highlighting in report by ankush [frappe] PR#24096 [backport/v4]

Backport of !1270 (merged)

Conflicts detected for source commit: 1e46294150704bf2aeff8cbd473180f203b27ad6
diff --cc frappe/core/doctype/report/report.json
index 373de6a03d,03dfbaa30b..0000000000
--- a/frappe/core/doctype/report/report.json
+++ b/frappe/core/doctype/report/report.json
@@@ -205,7 -205,7 +205,11 @@@
   "idx": 1,
   "index_web_pages_for_search": 1,
   "links": [],
++<<<<<<< HEAD
 + "modified": "2024-01-03 15:14:24.587669",
++=======
+  "modified": "2024-01-03 15:29:01.460404",
++>>>>>>> 1e46294150704bf2aeff8cbd473180f203b27ad6
   "modified_by": "Administrator",
   "module": "Core",
   "name": "Report",

Conflicts detected for source commit: 39d816c46bb72721f2f67f532aea848c58451b66
diff --cc frappe/core/doctype/report/report.json
index 03dfbaa30b,bd3d6a98d6..0000000000
--- a/frappe/core/doctype/report/report.json
+++ b/frappe/core/doctype/report/report.json
@@@ -257,5 -257,8 +257,12 @@@
   "sort_field": "modified",
   "sort_order": "DESC",
   "states": [],
++<<<<<<< HEAD
 + "track_changes": 1
++=======
+  "track_changes": 1,
+  "title_field": "report_name",
+  "translated_doctype": 1
+ 
++>>>>>>> 39d816c46bb72721f2f67f532aea848c58451b66
  }

---