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/libssp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libssp') diff --git a/package/libssp/Makefile b/package/libssp/Makefile index c1e3dabd7..4d714b346 100644 --- a/package/libssp/Makefile +++ b/package/libssp/Makefile @@ -15,7 +15,7 @@ endif PKG_NAME:= libssp PKG_DESCR:= stack smashing protection library -PKG_SECTION:= libs +PKG_SECTION:= libs/misc PKG_OPTS:= noremove NO_DISTFILES:= 1 -- cgit v1.2.3