-<<<<<<< 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
+50fce84f0327ee5c100f66594024b5f2 contrib.rsync.inactive
+7db07c243cf80a2fe71364555e234901 core-arm.rsync
+faedd8944bd5ecc397f73bf73bd624d4 core.rsync
+ca6c61c26966a4535e19e5df020163e8 opt-arm.rsync
+eded5385d3637f1918a82f4409abc64a opt.rsync