fix merge marker

WinterMute · WinterMute · commit 9e2e3d8c83d3 · 2018-05-11T18:52:24.000+01:00
diff --git 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
