chinese/tintin++: resolve conflict
Success: japanese/timidity++-slang v2.13.2_11
japanese/timidiy++-slang: resolve conflict