random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2025-12-28 13:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge master and resolve code conflict

Browse Source
This commit is contained in:
hardiknai-techm
2021-05-06 16:12:30 +05:30
parent cc4f20e482 23223cfb23
commit 2c58cd7be1
193 changed files with 6769 additions and 7218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Explorer/Panes/GenericRightPaneComponent/GenericRightPaneComponent.tsx
View File

@@ -1,6 +1,6 @@
import { IconButton, PrimaryButton } from "@fluentui/react";
import ErrorRedIcon from "images/error_red.svg";
import LoadingIndicatorIcon from "images/LoadingIndicator_3Squares.gif";
import { IconButton, PrimaryButton } from "office-ui-fabric-react/lib/Button";
import React, { FunctionComponent, ReactNode } from "react";
import { KeyCodes } from "../../../Common/Constants";