fix conflicts

2020-09-26 23:36:15 +02:00 · 2020-09-26 23:36:15 +02:00 · f78aed211f
parent 008662c940
commit f78aed211f
1 changed files with 0 additions and 3 deletions
--- a/src/backends/av_foundation.rs
+++ b/src/backends/av_foundation.rs
@ -120,11 +120,8 @@ impl Backend for AvFoundation {
            pitch: true,
            volume: true,
            is_speaking: true,
-<<<<<<< HEAD
            voices: true,
-=======
            utterance_callbacks: true,
->>>>>>> develop
        }
    }