fix merge issue

void remove_cr(

    char *str )

{

    char *pos;

    int32_t n, p = 0;

    /* remove all \r characters from the string */

    pos = strchr( str, '\r' );

    while ( pos != NULL )

    for ( n = 0; str[n] != 0; n++ )

    {

            strcpy( pos, pos + 1 );

            pos = strchr( pos, '\r' );

        char c = str[n];

        str[p] = c;

        p += ( c == '\r' ) ? 0 : 1;

    }

    str[p] = 0;

    return;

}

/*---------------------------------------------------------------------*

 * clearString()

 *