From b1cb2b1d9320af148aa22fb15e126d2fddf421b5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Tue, 11 May 2021 10:19:09 -0600
Subject: [PATCH] Fix bad merge

---
 src/voice/Playback.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/voice/Playback.ts b/src/voice/Playback.ts
index a9fcdf712a..5488ed6b84 100644
--- a/src/voice/Playback.ts
+++ b/src/voice/Playback.ts
@@ -16,7 +16,7 @@ limitations under the License.
 
 import EventEmitter from "events";
 import {UPDATE_EVENT} from "../stores/AsyncStore";
-import {arrayRescale, arraySeed, arraySmoothingResample} from "../utils/arrays";
+import {arrayFastResample, arrayRescale, arraySeed, arraySmoothingResample} from "../utils/arrays";
 import {SimpleObservable} from "matrix-widget-api";
 import {IDestroyable} from "../utils/IDestroyable";
 import {PlaybackClock} from "./PlaybackClock";