fix merge marker

2026-08-13 04:56:14 -05:00 · 2017-10-18 20:37:42 +01:00
parent 5559ee7f10
commit 9e2e3d8c83
1 changed files with 0 additions and 1 deletions
--- 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