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/lsscsi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/lsscsi') diff --git a/package/lsscsi/Makefile b/package/lsscsi/Makefile index 8cc747238..a67cba856 100644 --- a/package/lsscsi/Makefile +++ b/package/lsscsi/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= lsscsi PKG_VERSION:= 0.27 PKG_RELEASE:= 1 PKG_MD5SUM:= 33ab2927a9e567a47905e6a618c17859 -PKG_DESCR:= list SCSI devices -PKG_SECTION:= utils +PKG_DESCR:= list scsi devices +PKG_SECTION:= sys/utils PKG_URL:= http://sg.danny.cz/scsi/lsscsi.html PKG_SITES:= http://sg.danny.cz/scsi/ -- cgit v1.2.3