mystiq/hydrogen-web
Archived
4
1
Fork 1
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix rebase mistake

Browse source
This commit is contained in:
Bruno Windels 2021-09-06 13:09:16 +02:00
parent ae5a4f0051
commit 35f8c40a0c
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/matrix/storage/idb/stores/TimelineEventStore.ts
View file

@ -14,19 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
<<<<<<< HEAD:src/matrix/storage/idb/stores/TimelineEventStore.ts
import {EventKey} from "../../../room/timeline/EventKey.js";
import {EventKey} from "../../../room/timeline/EventKey";
import { StorageError } from "../../common";
import { encodeUint32 } from "../utils";
import {KeyLimits} from "../../common";
import {Store} from "../Store";
import {TimelineEvent, StateEvent} from "../../types";
=======
import {EventKey} from "../../../room/timeline/EventKey";
import { StorageError } from "../../common.js";
import { encodeUint32 } from "../utils.js";
import {KeyLimits} from "../../common.js";
>>>>>>> b01c3283 (convert EventKey to ts):src/matrix/storage/idb/stores/TimelineEventStore.js
interface Annotation {
count: number;