diff options
| author |   Sam James <sam@gentoo.org> | 2023-06-02 02:38:09 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-06-02 02:38:27 +0100 |
| commit | 3ba9230c6d42b8ac0eb0c73fa03870b54de0d2b7 (patch) | |
| tree | 595d22447f001d4dc1abe4795f10a567d9375278 /dev-util/cvise | |
| parent | x11-apps/xwininfo: Keyword 1.1.6 riscv, #907637 (diff) | |
| download | gentoo-3ba9230c6d42b8ac0eb0c73fa03870b54de0d2b7.tar.gz gentoo-3ba9230c6d42b8ac0eb0c73fa03870b54de0d2b7.tar.bz2 gentoo-3ba9230c6d42b8ac0eb0c73fa03870b54de0d2b7.zip | |
dev-util/cvise: fix merge conflict markers in KEYWORDS
Thanks to username234 for reporting.
Fixes: 5849d652941d202823b36b7e246d890f25af3c25
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util/cvise')
| -rw-r--r-- | dev-util/cvise/cvise-2.8.0.ebuild | 4 |
1 files changed, 0 insertions, 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} |