Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Resolve merge conflicts

Robin Dekkers6e252595ef74
diff --cc ui/component/or-chart/src/index.ts
index bf5cb8237,a630b65ff..6c7082cda
--- a/ui/component/or-chart/src/index.ts
+++ b/ui/component/or-chart/src/index.ts
@@@ -25,9 -25,9 +25,9 @@@ import "@openremote/or-input"
import "@openremote/or-panel";
import {MDCDialog} from '@material/dialog';
import "@openremote/or-translate";
-import Chart, {ChartDataSets} from "chart.js";
+import Chart, {ChartDataSets, ChartOptions} from "chart.js";
import {InputType, OrInputChangedEvent} from "@openremote/or-input";
- import moment, {unitOfTime} from "moment";
+ import moment from "moment";
import {OrAssetTreeSelectionChangedEvent} from "@openremote/or-asset-tree";
import {getAssetDescriptorIconTemplate} from "@openremote/or-icon";
import {MenuItem, OrMwcMenu, OrMwcMenuChangedEvent} from "@openremote/or-mwc-components/dist/or-mwc-menu";