mirror of
https://github.com/Azure/cosmos-explorer.git
synced 2026-04-26 08:21:33 +01:00
merge master and resolve code conflict
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import { Dropdown, IDropdownOption, Stack, TextField } from "@fluentui/react";
|
||||
import AddIcon from "images/Add-property.svg";
|
||||
import DeleteIcon from "images/delete.svg";
|
||||
import { Dropdown, IDropdownOption, Stack, TextField } from "office-ui-fabric-react";
|
||||
import React, { FunctionComponent, useRef, useState } from "react";
|
||||
import { NormalizedEventKey } from "../../../Common/Constants";
|
||||
import { GremlinPropertyValueType, InputPropertyValueTypeString, NewVertexData } from "../../../Contracts/ViewModels";
|
||||
|
||||
Reference in New Issue
Block a user