From bc3875d3a71ac3fdb07c0fcf863843b4fdfcf0c0 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 2 Jun 2023 09:28:30 +0100
Subject: gentoo auto-resync : 02:06:2023 - 09:28:30

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

(limited to 'dev-util/cvise/cvise-2.8.0.ebuild')

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}
-- 
cgit v1.2.3