Skip to content

Commit c8019e8

Browse files
committed
fix
1 parent a357b9e commit c8019e8

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

packages/shared-components/src/index.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@ export * from "./core/AvatarWithDetails";
1414
export * from "./core/roving";
1515
export * from "./room/composer/Banner";
1616
export * from "./crypto/SasEmoji";
17-
<<<<<<< hs/new-quick-settings-menu
18-
export * from "./event-tiles/UrlPreviewGroupView";
1917
export * from "./menus/UserMenu";
20-
=======
21-
>>>>>>> develop
2218
export * from "./room/timeline/ReadMarker";
2319
export * from "./room/timeline/event-tile/body/EventContentBodyView";
2420
export * from "./room/timeline/event-tile/body/RedactedBodyView";

0 commit comments

Comments
 (0)