From f78aed211fa2ff2a2684c5ad20939851efddbe62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Caddet?= <francois.caddet@inria.fr>
Date: Sat, 26 Sep 2020 23:36:15 +0200
Subject: [PATCH] fix conflicts

---
 src/backends/av_foundation.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/backends/av_foundation.rs b/src/backends/av_foundation.rs
index c1f1c7f..6940e07 100644
--- 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
         }
     }