You've already forked matrix-js-sdk
mirror of
https://github.com/matrix-org/matrix-js-sdk.git
synced 2025-11-23 17:02:25 +03:00
tidyup
This commit is contained in:
@@ -26,11 +26,7 @@ import {
|
||||
type ILeftRoom,
|
||||
type IRoomEvent,
|
||||
type IStateEvent,
|
||||
<<<<<<< HEAD
|
||||
type IStickyEvent,
|
||||
=======
|
||||
IStickyEvent,
|
||||
>>>>>>> 7750916d3 (Add tests)
|
||||
type IStrippedState,
|
||||
type ISyncResponse,
|
||||
SyncAccumulator,
|
||||
@@ -1073,11 +1069,7 @@ describe("SyncAccumulator", function () {
|
||||
});
|
||||
});
|
||||
|
||||
<<<<<<< HEAD
|
||||
describe("MSC4354 sticky events", () => {
|
||||
=======
|
||||
describe.only("MSC4354 sticky events", () => {
|
||||
>>>>>>> 7750916d3 (Add tests)
|
||||
function stickyEvent(ts = 0): IStickyEvent {
|
||||
const msgData = msg("test", "test text");
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user