def join_lines(line1, line2):
    """Join 2 lines of text

    >>> join_lines('abc', 'de')
    'abcde'
    >>> join_lines('a-', 'b')
    'ab'
    """
    if line1 == u"":
        pass
    elif line1[-1] == u'-':
        # hyphenated word at the end of the
        # line - don't add in a space and remove hyphen
        line1 = line1[:-1]
    elif line1[-1] != u' ':
        # no space at the end of this
        # line, add in a space
        line1 = line1 + u' '
    return line1 + line2