summaryrefslogtreecommitdiff
path: root/sys-devel/gcc/gcc-6.5.0-r1.ebuild
diff options
context:
space:
mode:
Diffstat (limited to 'sys-devel/gcc/gcc-6.5.0-r1.ebuild')
-rw-r--r--sys-devel/gcc/gcc-6.5.0-r1.ebuild6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys-devel/gcc/gcc-6.5.0-r1.ebuild b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
index 32e8d79202ce..0a8f58febc87 100644
--- a/sys-devel/gcc/gcc-6.5.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
@@ -7,11 +7,7 @@ PATCH_VER="2"
inherit toolchain
-<<<<<<< HEAD
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-=======
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
->>>>>>> next
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
RDEPEND=""
DEPEND="${RDEPEND}