random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2025-12-27 21:01:57 +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/SplashScreen/SplashScreen.tsx
View File

@@ -1,6 +1,7 @@
/**
* Accordion top class
*/
import { Link } from "@fluentui/react";
import AddDatabaseIcon from "images/AddDatabase.svg";
import NewQueryIcon from "images/AddSqlQuery_16x16.svg";
import NewStoredProcedureIcon from "images/AddStoredProcedure.svg";
@@ -11,7 +12,6 @@ import SampleIcon from "images/Hero-sample.svg";
import NotebookIcon from "images/notebook/Notebook-resource.svg";
import ScaleAndSettingsIcon from "images/Scale_15x15.svg";
import CollectionIcon from "images/tree-collection.svg";
import { Link } from "office-ui-fabric-react/lib/Link";
import * as React from "react";
import { AuthType } from "../../AuthType";
import * as Constants from "../../Common/Constants";