mirror of https://github.com/ndarilek/tts-rs.git
fix conflicts
This commit is contained in:
parent
008662c940
commit
f78aed211f
|
@ -120,11 +120,8 @@ impl Backend for AvFoundation {
|
||||||
pitch: true,
|
pitch: true,
|
||||||
volume: true,
|
volume: true,
|
||||||
is_speaking: true,
|
is_speaking: true,
|
||||||
<<<<<<< HEAD
|
|
||||||
voices: true,
|
voices: true,
|
||||||
=======
|
|
||||||
utterance_callbacks: true,
|
utterance_callbacks: true,
|
||||||
>>>>>>> develop
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue