From c99e0c225439383eb8a9f3e65f922de2e0e9e975 Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Thu, 31 Jan 2013 18:35:52 +0000 Subject: [PATCH] ports: fixed .md5sum --- ports/.md5sum | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ports/.md5sum b/ports/.md5sum index 12b7308..f413c71 100644 --- a/ports/.md5sum +++ b/ports/.md5sum @@ -1,10 +1,5 @@ -<<<<<<< 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 +ea6b5d166ce6446e78ab8b7df2fdb80b core-armhf.rsync 8cb8a1539dd74bb566c166877ac16856 core.rsync 4e5adb9453c7fedce96e3d205a3cb9b9 opt-armhf.rsync 541d0991ecf5f96ae52d1e13f481e123 opt.rsync -- 2.26.2