libdrm: updated to 2.4.96

[ports/xorg-arm64.git] / libdrm / .md5sum

diff --git a/libdrm/.md5sum b/libdrm/.md5sum
index 36e7e657e374a6ccb569730f05debff80365454a..761afbeb425d6fc76319cfcbf11c1a89f0c346fd 100644 (file)
--- a/libdrm/.md5sum
+++ b/libdrm/.md5sum
@@ -1 +1,5 @@
+<<<<<<< HEAD
 41b9ed196a27f5dc7fb88412b704e9fd  libdrm-2.4.95.tar.bz2
+=======
+f296d87272b1befeada3bb135751ab3d  libdrm-2.4.96.tar.bz2
+>>>>>>> libdrm: updated to 2.4.96