1
0
mirror of https://github.com/ndarilek/tts-rs.git synced 2024-11-17 13:49:36 +00:00

fix conflicts

This commit is contained in:
François Caddet 2020-09-26 23:36:15 +02:00
parent 008662c940
commit f78aed211f

View File

@ -120,11 +120,8 @@ impl Backend for AvFoundation {
pitch: true,
volume: true,
is_speaking: true,
<<<<<<< HEAD
voices: true,
=======
utterance_callbacks: true,
>>>>>>> develop
}
}