libdrm: fixed update to 2.4.96

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

diff --git a/libdrm/Pkgfile b/libdrm/Pkgfile
index 2a72ff812df76602fe9c7bb46f65816613ddfe89..79160c5966328ba079dd0a22685f5ca90ee826db 100644 (file)
--- a/libdrm/Pkgfile
+++ b/libdrm/Pkgfile
@@ -5,11 +5,7 @@
 # Depends on: libpthread-stubs xorg-libpciaccess 
 
 name=libdrm
-<<<<<<< HEAD
-version=2.4.95
-=======
 version=2.4.96
->>>>>>> libdrm: updated to 2.4.96
 release=1
 source=(http://dri.freedesktop.org/libdrm/libdrm-$version.tar.bz2)