-<<<<<<< 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
+248f59fb9120aabcb6ead69c06dae8a4 contrib.rsync.inactive
+515e805921e25195b5d3495a6a678ffe core-arm.rsync
+cab6bff69ef9b24a349a21dba1e63a45 core.rsync
+a8cc9bf8bb79609f63c8e421b3417c74 opt-arm.rsync
+59b2cc8ed2e11a829c463fa85836a27c opt.rsync
1f178e2bb1beab9782993931c9832280 ports-1.5.tar.gz
-a94ea8ef1ab69993ab555004b0c85f63 xorg-armhf.rsync
-efeb3ce474a4a0c67ecb62c0eaaf4e34 xorg.rsync
+ab485150e051e48f4d8396dc0655303a xorg-arm.rsync
+7793260dca3f2c31f96fd70a98ff49fd xorg.rsync