[gentoo-commits] repo/gentoo:master commit in: dev-util/cvise/

[Sam James]

commit:     3ba9230c6d42b8ac0eb0c73fa03870b54de0d2b7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  2 01:38:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  2 01:38:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba9230c

dev-util/cvise: fix merge conflict markers in KEYWORDS

Thanks to username234 for reporting.

Fixes: 5849d652941d202823b36b7e246d890f25af3c25
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/cvise/cvise-2.8.0.ebuild | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev-util/cvise/cvise-2.8.0.ebuild 
b/dev-util/cvise/cvise-2.8.0.ebuild
index cb702c48606d..417428e5e07d 100644
--- a/dev-util/cvise/cvise-2.8.0.ebuild
+++ b/dev-util/cvise/cvise-2.8.0.ebuild
@@ -15,11 +15,7 @@ SRC_URI="
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-<<<<<<< HEAD
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-=======
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
->>>>>>> 2a0536d75d4e (dev-util/cvise: Keyword 2.8.0 riscv, #907672)
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}