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/util-linux/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'package/util-linux') diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index e037c09d3..957bc6468 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -36,7 +36,6 @@ PKGSD_SWAP_UTILS:= swap space management utilities PKGSS_SWAP_UTILS:= libblkid PKGSC_SWAP_UTILS:= fs PKGSD_LOSETUP:= loop devices management utilities -PKGSS_LOSETUP:= kmod-blk-dev-loop PKGSC_LOSETUP:= fs PKGSD_MOUNT:= mount/umount utilities PKGSS_MOUNT:= libblkid libmount libuuid libncurses -- cgit v1.2.3