From 0b7461912e1f37e70aee5bc3589d3b9325daea5b Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Wed, 17 Oct 2018 19:59:23 +0200
Subject: [PATCH] libdrm: updated to 2.4.96

---
 libdrm/.md5sum | 4 ++++
 libdrm/Pkgfile | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/libdrm/.md5sum b/libdrm/.md5sum
index 36e7e65..761afbe 100644
--- 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
diff --git a/libdrm/Pkgfile b/libdrm/Pkgfile
index 042f138..2a72ff8 100644
--- a/libdrm/Pkgfile
+++ b/libdrm/Pkgfile
@@ -5,7 +5,11 @@
 # 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)
 
-- 
2.26.2