From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/open-iscsi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/open-iscsi') diff --git a/package/open-iscsi/Makefile b/package/open-iscsi/Makefile index c4d230403..5ce21fc93 100644 --- a/package/open-iscsi/Makefile +++ b/package/open-iscsi/Makefile @@ -8,8 +8,8 @@ PKG_VERSION:= 2.0 PKG_EXTRAVER:= 871 PKG_RELEASE:= 1 PKG_MD5SUM:= 0c403e8c9ad41607571ba0e6e8ff196e -PKG_DESCR:= iSCSI utilities -PKG_SECTION:= fs +PKG_DESCR:= iscsi utilities +PKG_SECTION:= sys/fs PKG_URL:= http://www.open-iscsi.org/ PKG_SITES:= http://www.open-iscsi.org/bits/ -- cgit v1.2.3