From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict
---
package/diffutils/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'package/diffutils/Makefile')
diff --git a/package/diffutils/Makefile b/package/diffutils/Makefile
index d0502b60a..166d39c39 100644
--- a/package/diffutils/Makefile
+++ b/package/diffutils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.8.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 71f9c5ae19b60608f6c7f162da86a428
PKG_DESCR:= show differences between two files
-PKG_SECTION:= lang
+PKG_SECTION:= sys/utils
PKG_URL:= http://www.gnu.org/software/diffutils/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
PKG_BB:= 1
--
cgit v1.2.3