util-linux; updated to 2.31.1

[ports/core-arm.git] / ports / .md5sum

diff --git a/ports/.md5sum b/ports/.md5sum
index 12b7308279af728dd0382e161d7137dc7bac225c..ade4e140fadc4415a31d89b31e1a04702b7f076a 100644 (file)
--- a/ports/.md5sum
+++ b/ports/.md5sum
@@ -1,13 +1,12 @@
-<<<<<<< HEAD
-c79603d71569837b6848c5cb320c44bd  contrib.rsync.inactive
-ea6b5d166ce6446e78ab8b7df2fdb80b  core-armhf.rsync
-=======
-49132c847c2d14ed0dbb61c6f53b0e1a  contrib.rsync.inactive
-6f0a576cbe0bcbb89b2ae5c9423025c5  core-arm.rsync
->>>>>>> 38a9764... ports: fixed issue with contrib.rsync.inactive
-8cb8a1539dd74bb566c166877ac16856  core.rsync
-4e5adb9453c7fedce96e3d205a3cb9b9  opt-armhf.rsync
-541d0991ecf5f96ae52d1e13f481e123  opt.rsync
+804bb419e539a70ad80e4c03df3c3411  contrib.pub
+c3d44c0ae8fce9d4d9571a3eec12ef01  contrib.rsync.inactive
+d0c0f9e58754c36dd698474f3a722350  core-arm.rsync
+b8dd0aad383810cad920d6548cd1cb56  core.pub
+3d659cabe8cf59ef5a036c9375716090  core.rsync
+8ea7e4396e011e5b1f64fe19a3b6d248  opt-arm.rsync
+0d1f1fde50a9bd743d9cac6b235f038c  opt.pub
+8e7b8a473c4caefbdc1e33505e4a6050  opt.rsync
 1f178e2bb1beab9782993931c9832280  ports-1.5.tar.gz
-a94ea8ef1ab69993ab555004b0c85f63  xorg-armhf.rsync
-efeb3ce474a4a0c67ecb62c0eaaf4e34  xorg.rsync
+5363578b4bef055ef7102d6cdc38ca5d  xorg-arm.rsync
+69927e5d0ae5dc3455faeaac916c4db2  xorg.pub
+3e278ef7c4ff9529184560eac57e22a6  xorg.rsync