From 53cb23a2c55d7ab2c3582dc58d4d0e6af23aa5db Mon Sep 17 00:00:00 2001 From: Jaromil Date: Wed, 8 Jun 2016 19:44:35 +0200 Subject: [PATCH] config merge --- config | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/config b/config index 84cbbdc..a7a5942 100755 --- a/config +++ b/config @@ -40,13 +40,8 @@ section="main" # core packages for the system core_packages=(devuan-keyring debian-keyring) -<<<<<<< HEAD -core_packages+=(binutils ca-certificates curl) -core_packages+=(console-common less nano vim) -======= core_packages+=(initramfs-tools binutils ca-certificates curl) -core_packages+=(locales console-common less nano vim) ->>>>>>> progress on iso making +core_packages+=(console-common less nano vim) # base packages for the system base_packages=(bzip2 dialog apt-utils fakeroot e2fsprogs parted)