From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- package/xf86-input-evtouch/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xf86-input-evtouch') diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile index 9e9da4f1c..9abb28db2 100644 --- a/package/xf86-input-evtouch/Makefile +++ b/package/xf86-input-evtouch/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 4d8e092356d8353002f60a4907046c13 PKG_DESCR:= X11 driver for touchscreen PKG_SECTION:= x11/drivers -PKG_DEPENDS:= xorg-server kmod-input-evdev +PKG_DEPENDS:= xorg-server PKG_BUILDDEP:= xorg-server PKG_SITES:= http://www.conan.de/touchscreen/ PKG_NEED_CXX:= 1 -- cgit v1.2.3