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/cryptodev-linux/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'package/cryptodev-linux') diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile index db0069b8b..4dc988f24 100644 --- a/package/cryptodev-linux/Makefile +++ b/package/cryptodev-linux/Makefile @@ -10,7 +10,6 @@ PKG_MD5SUM:= eade38998313c25fd7934719cdf8a2ea PKG_DESCR:= cryptodev-linux kernel module PKG_SECTION:= crypto PKG_BUILDDEP:= openssl -PKG_DEPENDS:= kmod-crypto-manager2 PKG_URL:= http://home.gna.org/cryptodev-linux/ PKG_SITES:= http://download.gna.org/cryptodev-linux/ -- cgit v1.2.3