Travis Ralston cea3831c20 Fix merge conflicts ...

This is done outside of the merge to highlight the changes, hopefully.

2020-01-07 14:43:36 -07:00

..

megolm.spec.js

Fix merge conflicts

2020-01-07 14:43:36 -07:00

olm.spec.js

Convert tests to ES6

2019-12-17 15:16:37 -07:00