random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2026-01-10 13:08:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
hardiknai-techm
2021-05-06 17:12:03 +05:30
parent e91145234f 23223cfb23
commit fc83484b6c
194 changed files with 7219 additions and 8781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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