From 9e2e3d8c83d3cde95dc61cb347c920913d825898 Mon Sep 17 00:00:00 2001
From: Dave Murphy <davem@devkitpro.org>
Date: Wed, 18 Oct 2017 20:37:42 +0100
Subject: [PATCH] fix merge marker

---
 select_toolchain.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/select_toolchain.sh b/select_toolchain.sh
index f11819a..f32b9d2 100755
--- a/select_toolchain.sh
+++ b/select_toolchain.sh
@@ -45,7 +45,6 @@ case "$VERSION" in
     MN_BINUTILS_VER=2.17
     NEWLIB_VER=2.5.0
     GDB_VER=8.0.1
->>>>>>> update binutils, gcc & gdb versions
     basedir='dkppc'
     package=devkitPPC
     target=powerpc-eabi