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

diff --git a/ports/.md5sum b/ports/.md5sum
index 12b7308..0ad2877 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
+50fce84f0327ee5c100f66594024b5f2  contrib.rsync.inactive
+7db07c243cf80a2fe71364555e234901  core-arm.rsync
+faedd8944bd5ecc397f73bf73bd624d4  core.rsync
+ca6c61c26966a4535e19e5df020163e8  opt-arm.rsync
+eded5385d3637f1918a82f4409abc64a  opt.rsync
 1f178e2bb1beab9782993931c9832280  ports-1.5.tar.gz
-a94ea8ef1ab69993ab555004b0c85f63  xorg-armhf.rsync
-efeb3ce474a4a0c67ecb62c0eaaf4e34  xorg.rsync
+f86c5b27a36bfc161d9c5f07d3997455  xorg-arm.rsync
+c24101073a06fc58a02c99bf5d56bea7  xorg.rsync