From 35f40bcc48cf7b1249d254658c5acecdbfa4c9f4 Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Thu, 31 Jan 2013 18:22:23 +0000 Subject: [PATCH] ports: fixed issue with contrib.rsync.inactive --- ports/.md5sum | 5 +++++ ports/contrib.rsync.inactive | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/.md5sum b/ports/.md5sum index 1331a21..12b7308 100644 --- a/ports/.md5sum +++ b/ports/.md5sum @@ -1,5 +1,10 @@ +<<<<<<< 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 diff --git a/ports/contrib.rsync.inactive b/ports/contrib.rsync.inactive index e84298f..a2697a0 100644 --- a/ports/contrib.rsync.inactive +++ b/ports/contrib.rsync.inactive @@ -1,3 +1,3 @@ host=crux.nu -collection=ports/crux-2.7/contrib/ +collection=ports/crux-2.8/contrib/ destination=/usr/ports/contrib -- 2.26.2