diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
| commit | da491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch) | |
| tree | d3e34a8bd906741ab18cf69d8d4f732853e26ade /profiles/arch/arm64/package.use.mask | |
| parent | ad6182343997a405079870a2fe91c4e0c6b94595 (diff) | |
| parent | 5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff) | |
gentoo resync : 28.09.2019
Diffstat (limited to 'profiles/arch/arm64/package.use.mask')
| -rw-r--r-- | profiles/arch/arm64/package.use.mask | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask index ae5f9bc1c798..92213a34744d 100644 --- a/profiles/arch/arm64/package.use.mask +++ b/profiles/arch/arm64/package.use.mask @@ -1,6 +1,13 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +<<<<<<< HEAD +======= +# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-09-27) +# some testsuite deps are not keyworded +sys-fs/zfs test-suite + +>>>>>>> next # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21) # iasl is keyworded ~arm64 sys-firmware/seabios -debug |