build(deps): bump datatable to latest by shariquerik [frappe] PR#24093 [backport/v4]

Backport of !1269 (merged)

Conflicts detected for source commit: 11b49a85992d1c27f8e7b1a412e88c9518eca6c6
diff --cc package.json
index a6b330013b,21ae79cf26..0000000000
--- a/package.json
+++ b/package.json
@@@ -65,7 -47,7 +47,11 @@@
    "fast-deep-equal": "^2.0.1",
    "fast-glob": "^3.2.5",
    "frappe-charts": "2.0.0-rc22",
++<<<<<<< HEAD
 +  "frappe-datatable": "^1.17.10",
++=======
+   "frappe-datatable": "1.17.13",
++>>>>>>> 11b49a85992d1c27f8e7b1a412e88c9518eca6c6
    "frappe-gantt": "^0.6.0",
    "highlight.js": "^10.4.1",
    "html5-qrcode": "^2.3.8",
diff --cc yarn.lock
index 2e002d5ffb,e951d7b58f..0000000000
--- a/yarn.lock
+++ b/yarn.lock
@@@ -1806,10 -1802,10 +1806,17 @@@ frappe-charts@2.0.0-rc22
    resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc22.tgz#9a5a747febdc381a1d4d7af96e89cf519dfba8c0"
    integrity sha512-N7f/8979wJCKjusOinaUYfMxB80YnfuVLrSkjpj4LtyqS0BGS6SuJxUnb7Jl4RWUFEIs7zEhideIKnyLeFZF4Q==
  
++<<<<<<< HEAD
 +frappe-datatable@1.17.10:
 +  version "1.17.10"
 +  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.17.10.tgz#8526e0e360b493a72114afd2a4dc4c155b4a14dd"
 +  integrity sha512-D537Kfs9F/P8kw7tk/yvdNc/mexRShOlCJc4dL1yPXk6wXIXthFiniq+R8P8jh61aHLqLQr0LmPahAI40+9v+w==
++=======
+ frappe-datatable@1.17.13:
+   version "1.17.13"
+   resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.17.13.tgz#349a15fd102b8abe55ab903c65de074aa66a26d6"
+   integrity sha512-rHzLjuAbWdbqEZbU6RCcimyeTswdIKtl8WJLjctj5zze7w5DFSQX0iDTbKNBG7TehS7YqP4k+ySIhvkHRELq3w==
++>>>>>>> 11b49a85992d1c27f8e7b1a412e88c9518eca6c6
    dependencies:
      hyperlist "^1.0.0-beta"
      lodash "^4.17.5"

Conflicts detected for source commit: 53e9a109c8f11a5a86ddae6ebb53e55bf7e1643e
diff --cc package.json
index c6e4d3c1f6,c14dd86b8e..0000000000
--- a/package.json
+++ b/package.json
@@@ -47,7 -65,7 +47,11 @@@
    "fast-deep-equal": "^2.0.1",
    "fast-glob": "^3.2.5",
    "frappe-charts": "2.0.0-rc22",
++<<<<<<< HEAD
 +  "frappe-datatable": "1.17.13",
++=======
+   "frappe-datatable": "^1.17.13",
++>>>>>>> 53e9a109c8f11a5a86ddae6ebb53e55bf7e1643e
    "frappe-gantt": "^0.6.0",
    "highlight.js": "^10.4.1",
    "html5-qrcode": "^2.3.8",

---

added botbackport label

restored source branch backport/v4-dev/1269

approved this merge request

enabled an automatic merge when the pipeline for b5e91dc0 succeeds

mentioned in commit dc4b0a8c

merged

mentioned in commit 5c8a11dd