commit: c1134b0c2ed25cae901127d8a31e7b3f078238d4 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Wed Jan 6 14:17:43 2016 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Wed Jan 6 14:17:43 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1134b0c
profiles/package.mask: Clean cruft profiles/package.mask | 1 - 1 file changed, 1 deletion(-) diff --git a/profiles/package.mask b/profiles/package.mask index bae9a74..449e9c5 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -238,7 +238,6 @@ x11-wm/matchbox-window-manager x11-themes/matchbox-themes-extra x11-wm/matchbox x11-misc/matchbox-keyboard ->>>>>>> 603aa10... profiles/package.mask: Mask some packages for removal # Matthias Maier <[email protected]> (06 Jan 2016) # Obsolete package, nowadays bundled with media-sound/quodlibet
