(#25346) [parallel-hashmap] Bump version to 1.4.0

* [parallel-hashmap] Bump version to 1.4.0

* Update sha256 and resolve conflicts.

* Fix merge conflict

recipes/parallel-hashmap/all/conandata.yml

@@ -1,21 +1,24 @@
 sources:
+  "1.4.0":
+    url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/v1.4.0.tar.gz"
+    sha256: "766e05d19c27d9c09e6f9a627868daf451f4fbdd1b617f1bb875fb9402bfb78b"
   "1.3.12":
     url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/v1.3.12.tar.gz"
     sha256: "0cc203144321924cfbfcc401f42d8204c0dd24e2760c7a1c091baa16d9777c08"
   "1.3.11":
     url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/v1.3.11.tar.gz"
     sha256: "0515a681bfb24207013786a7737e9d8561302e656689d8a65ea480bbabab460f"
   "1.3.8":
-    url: "https://github.com/greg7mdp/parallel-hashmap/archive/v1.3.8.tar.gz"
+    url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/v1.3.8.tar.gz"
     sha256: "c4562ea360dc1dcaddd96a0494c753400364a52c7aa9750de49d8e6a222d28d3"
   "1.37":
-    url: "https://github.com/greg7mdp/parallel-hashmap/archive/1.37.tar.gz"
+    url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.37.tar.gz"
     sha256: "2ac652be0552fcb53a1163c08c1f28f29f0756594fcc587eebb4d8b363153709"
   "1.36":
     url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.36.tar.gz"
     sha256: "33acf44158a9661a9d630d13f9250a2aa27a770cb3771df77b1ba1a661c0b766"
   "1.35":
-    url: "https://github.com/greg7mdp/parallel-hashmap/archive/1.35.tar.gz"
+    url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.35.tar.gz"
     sha256: "308ab6f92e4c6f49304562e352890cf7140de85ce723c097e74fbdec88e0e1ce"
   "1.34":
     url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.34.tar.gz"

recipes/parallel-hashmap/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "1.4.0":
+    folder: all
   "1.3.12":
     folder: all
   "1.3.11":