tconfig merge - libdevuansdk - common library for devuan's simple distro kits
  HTML git clone https://git.parazyd.org/libdevuansdk
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
   DIR README
   DIR LICENSE
       ---
   DIR commit 53cb23a2c55d7ab2c3582dc58d4d0e6af23aa5db
   DIR parent ca24af741afcbdc4b803bf73e87157c7c27e1fd4
  HTML Author: Jaromil <jaromil@dyne.org>
       Date:   Wed,  8 Jun 2016 19:44:35 +0200
       
       config merge
       
       Diffstat:
         M config                              |       7 +------
       
       1 file changed, 1 insertion(+), 6 deletions(-)
       ---
   DIR diff --git a/config b/config
       t@@ -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)