diff options
Diffstat (limited to 'acceptable-package-list.txt')
| -rw-r--r-- | acceptable-package-list.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/acceptable-package-list.txt b/acceptable-package-list.txt index a7e62f95b..99d3a2138 100644 --- a/acceptable-package-list.txt +++ b/acceptable-package-list.txt @@ -1,4 +1,8 @@ busybox-initscripts +<<<<<<< HEAD +======= +abuildhelper +>>>>>>> 0c5d733db74cad4285bc792567963c45a0b7ba2d file libcap alpine-baselayout @@ -53,3 +57,11 @@ libbz2 cdrkit acct alpine-sdk +<<<<<<< HEAD +======= +squashfs-tools +xz-libs +lzo +libssh2 +libattr +>>>>>>> 0c5d733db74cad4285bc792567963c45a0b7ba2d |