mirror of
https://github.com/Azure/cosmos-explorer.git
synced 2025-12-28 21:32:05 +00:00
merge master and resolve code conflict
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import { FocusZone } from "@fluentui/react";
|
||||
import * as React from "react";
|
||||
import { FocusZone } from "office-ui-fabric-react/lib/FocusZone";
|
||||
import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
|
||||
|
||||
export interface CaptionId {
|
||||
|
||||
Reference in New Issue
Block a user