summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0')
-rw-r--r--metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.04
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0
index 2e88461f1071..50e4e93b2490 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0
@@ -10,5 +10,9 @@ LICENSE=MIT
RDEPEND=>=dev-libs/libinput-1.7.0:0= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
SLOT=0
SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-0.29.0.tar.bz2
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7
+>>>>>>> next
_md5_=e55901fa96f5c48b2cd70355e6acbbd1