summaryrefslogtreecommitdiff
path: root/mercurial/.signature
diff options
context:
space:
mode:
authorTim Biermann <tbier@posteo.de>2020-10-20 11:37:07 +0000
committerTim Biermann <tbier@posteo.de>2020-10-20 11:38:36 +0000
commit3fb3b6cf28529a7afdc3c44cf8602c1f8432827f (patch)
tree14046a3d5b8e982869ab6f8e799e9702cc5eafd3 /mercurial/.signature
parenteddabdd346df98bc551afbf1184abc4a335816b0 (diff)
downloadcontrib-3fb3b6cf28529a7afdc3c44cf8602c1f8432827f.tar.gz
contrib-3fb3b6cf28529a7afdc3c44cf8602c1f8432827f.tar.xz
mercurial: bumped for python 3.9
Diffstat (limited to 'mercurial/.signature')
-rw-r--r--mercurial/.signature11
1 files changed, 2 insertions, 9 deletions
diff --git a/mercurial/.signature b/mercurial/.signature
index fda58d14a..1ad43ad30 100644
--- a/mercurial/.signature
+++ b/mercurial/.signature
@@ -1,12 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
-<<<<<<< HEAD
-RWSagIOpLGJF3wEz0c+3R5ychfZ9XTBSA+Z85pqVdF+ET6uEEqPiK7xkiQvDvMeqDfL0jvvzN6zyvhEUhQDAuExbyJrJZFHeMg8=
-SHA256 (Pkgfile) = dcec4fcf4ef0345cd1c726244f57f32e52560ed9a1674d81140d39ade74b08d7
-SHA256 (.footprint) = 27a06e40f6c9ea64c6ca45347d7623d333650f2c04964f6258befec3efbc1a19
-SHA256 (mercurial-5.5.tar.gz) = c1ed28e1534304a7a4981ed59905286d1c56acd5b75755eedd184171a4a782b4
-=======
-RWSagIOpLGJF33Uzby7xuoMyoMOW2K6oc86bUS8eM8aMgDE04KVYNzY1gKHGE95wVyzLbzn+c7xCCBKm1gOMdLRvxbTAeo9yWw4=
+RWSagIOpLGJF3zUoVktKNhswKcsR+EiTsh/hrVUHNLEVYrxBwWPT07KXCXg4xB5maCmwIcBeOTYlNAwOe3z2TrepD/t3w17ZVgM=
SHA256 (Pkgfile) = 998a9b9442dbf31f642788a75d6a470fc9b67fff7e0fd435d18e9f8b890cd9c4
-SHA256 (.footprint) = 12808740fb2165b7c08069b8c792bdfe8c014672ac4c6aa0c1db62eeea3be612
+SHA256 (.footprint) = cdf2979dcae1d18f2081e3c88db8c9da953bc1009077748f7d7d2a65afd0fca8
SHA256 (mercurial-5.5.1.tar.gz) = 4f95ad8d575941835d67210e9f8700cc594a441e4fd0bd029c084923b4f40874
->>>>>>> 8fc33be2f1338250cc34646c10cf05188c5fd1e5

Generated by cgit