| 1 |
commit: 264b538a5d84fcb46da045a287705cee121a3505 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 15 21:52:39 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 15 21:52:39 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=264b538a |
| 7 |
|
| 8 |
profiles: fix merge markers |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
profiles/package.mask | 5 ----- |
| 13 |
1 file changed, 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 16 |
index 82ba0fb44c78..52242c0e26c6 100644 |
| 17 |
--- a/profiles/package.mask |
| 18 |
+++ b/profiles/package.mask |
| 19 |
@@ -32,7 +32,6 @@ |
| 20 |
## app-misc/some-package |
| 21 |
|
| 22 |
#--- END OF EXAMPLES --- |
| 23 |
-<<<<<<< HEAD |
| 24 |
|
| 25 |
# Georgy Yakovlev <gyakovlev@g.o> (2022-01-15) |
| 26 |
# Last branch update happened ~ 12 month ago. |
| 27 |
@@ -44,9 +43,6 @@ |
| 28 |
~sys-fs/zfs-0.8.6 |
| 29 |
~sys-fs/zfs-kmod-0.8.6 |
| 30 |
|
| 31 |
-||||||| parent of 8b4d5f684a22 (profiles: Mask dev-db/oracle-instantclient-* for removal) |
| 32 |
-======= |
| 33 |
- |
| 34 |
# Marco Genasci <fedeliallalinea@×××××.com> (2022-01-15) |
| 35 |
# Removed in favor of unified package dev-db/oracle-instantclient |
| 36 |
# Removal on 2022-02-15. Bug #589146 |
| 37 |
@@ -55,7 +51,6 @@ dev-db/oracle-instantclient-jdbc |
| 38 |
dev-db/oracle-instantclient-odbc |
| 39 |
dev-db/oracle-instantclient-sqlplus |
| 40 |
|
| 41 |
->>>>>>> 8b4d5f684a22 (profiles: Mask dev-db/oracle-instantclient-* for removal) |
| 42 |
# Ulrich Müller <ulm@g.o> (2022-01-15) |
| 43 |
# Pretest versions, masked for testing. |
| 44 |
<app-editors/emacs-28.0.9999:28-vcs |
Archives