mirror of https://github.com/vector-im/riot-web
Fix bad merge
parent
d8e3458c55
commit
b1cb2b1d93
|
@ -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";
|
||||
|
|
Loading…
Reference in New Issue