X-Git-Url: http://gitweb/?a=blobdiff_plain;f=ports%2F.md5sum;h=eb9d0bda7dc25980077377cca9a0e8830246662a;hb=refs%2Fheads%2F3.0;hp=12b7308279af728dd0382e161d7137dc7bac225c;hpb=35f40bcc48cf7b1249d254658c5acecdbfa4c9f4;p=ports%2Fcore-arm.git

diff --git a/ports/.md5sum b/ports/.md5sum
index 12b7308..eb9d0bd 100644
--- a/ports/.md5sum
+++ b/ports/.md5sum
@@ -1,13 +1,8 @@
-<<<<<<< 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
+1235031f24a2a6b4fcc790ebd879c973  contrib.rsync.inactive
+258abb4a71b4492775491ff9b794ebc2  core-arm.rsync
+d7ede8cfe6da977021f4217363c07d6d  core.rsync
+43fa89c9e106f774f02b25c47c66c164  opt-arm.rsync
+ba2755e20ca669275ee837ee9cd18c50  opt.rsync
 1f178e2bb1beab9782993931c9832280  ports-1.5.tar.gz
-a94ea8ef1ab69993ab555004b0c85f63  xorg-armhf.rsync
-efeb3ce474a4a0c67ecb62c0eaaf4e34  xorg.rsync
+9f71ef6b0b381828629858fbb9eff78a  xorg-arm.rsync
+3bb81f15783c470e116e41a2fabece90  xorg.rsync