diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 22:43:21 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 22:43:21 +0100 |
| commit | 30d6f67c98d149508509d5e86f176d558793acc0 (patch) | |
| tree | 1ebe9856e7491a24ce86267d6220a9d34dec4ca0 | |
| parent | 9b1e6d491f32eb4caf0c8e197bdec075713c97ca (diff) | |
fix merge issue
| -rw-r--r-- | profiles/package.mask | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/profiles/package.mask b/profiles/package.mask index 72798308a697..c191e08ea922 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -29,8 +29,6 @@ #--- END OF EXAMPLES --- -<<<<<<< HEAD -======= # Stefan Strogin <steils@gentoo.org> (2019-09-27) # Requires >=dev-lang/lua-5.3 which is masked >=dev-util/bam-0.5.0 @@ -46,7 +44,6 @@ virtual/python-pmw # Blocks its own dependency. Bug #695606. =x11-libs/libXvMC-1.0.12 ->>>>>>> next # Joonas Niilola <juippis@gentoo.org> (2019-09-24) # Upstream decided to deprecate this service, and app. Removal in # ~30 days. Bug #695562 |