From d28c8b0bc85fee7ee2736f5cf463b9966e0a7e32 Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Thu, 18 Oct 2018 19:28:15 +0200
Subject: [PATCH] libdrm: fixed update to 2.4.96

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

diff --git a/libdrm/.md5sum b/libdrm/.md5sum
index 761afbe..9d8f827 100644
--- 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 2a72ff8..79160c5 100644
--- 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)
 
-- 
2.26.2