summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-01-15 21:52:39 +0000
committerSam James <sam@gentoo.org>2022-01-15 21:52:39 +0000
commit264b538a5d84fcb46da045a287705cee121a3505 (patch)
tree19078936bd9b1f0334a2c37d6d84d45243000685 /profiles/package.mask
parentRevert "dev-db/oracle-instantclient-*: removed old packages" (diff)
downloadgentoo-264b538a5d84fcb46da045a287705cee121a3505.tar.gz
gentoo-264b538a5d84fcb46da045a287705cee121a3505.tar.bz2
gentoo-264b538a5d84fcb46da045a287705cee121a3505.zip
profiles: fix merge markers
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'profiles/package.mask')
-rw-r--r--profiles/package.mask5
1 files changed, 0 insertions, 5 deletions
diff --git a/profiles/package.mask b/profiles/package.mask
index 82ba0fb44c78..52242c0e26c6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,7 +32,6 @@
## app-misc/some-package
#--- END OF EXAMPLES ---
-<<<<<<< HEAD
# Georgy Yakovlev <gyakovlev@gentoo.org> (2022-01-15)
# Last branch update happened ~ 12 month ago.
@@ -44,9 +43,6 @@
~sys-fs/zfs-0.8.6
~sys-fs/zfs-kmod-0.8.6
-||||||| parent of 8b4d5f684a22 (profiles: Mask dev-db/oracle-instantclient-* for removal)
-=======
-
# Marco Genasci <fedeliallalinea@gmail.com> (2022-01-15)
# Removed in favor of unified package dev-db/oracle-instantclient
# Removal on 2022-02-15. Bug #589146
@@ -55,7 +51,6 @@ dev-db/oracle-instantclient-jdbc
dev-db/oracle-instantclient-odbc
dev-db/oracle-instantclient-sqlplus
->>>>>>> 8b4d5f684a22 (profiles: Mask dev-db/oracle-instantclient-* for removal)
# Ulrich Müller <ulm@gentoo.org> (2022-01-15)
# Pretest versions, masked for testing.
<app-editors/emacs-28.0.9999:28-vcs