diff options
| author | Grégoire Aubert <gregoire.aubert@sonarsource.com> | 2017-07-24 09:43:46 +0200 |
|---|---|---|
| committer | Grégoire Aubert <gregoire.aubert@sonarsource.com> | 2017-07-24 09:43:58 +0200 |
| commit | e1ff5fc28e65b7513caa954359d7467b899a26d4 (patch) | |
| tree | 99f6ea7243a6b018ac2b5b2558ee9253004f0430 /server/sonar-web/src/main/js | |
| parent | 1c1b3bb5715b9308185e313effe8a2f91a940433 (diff) | |
| download | sonarqube-e1ff5fc28e65b7513caa954359d7467b899a26d4.tar.gz sonarqube-e1ff5fc28e65b7513caa954359d7467b899a26d4.zip | |
Fix merge error
Diffstat (limited to 'server/sonar-web/src/main/js')
| -rw-r--r-- | server/sonar-web/src/main/js/apps/overview/components/OverviewApp.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server/sonar-web/src/main/js/apps/overview/components/OverviewApp.js b/server/sonar-web/src/main/js/apps/overview/components/OverviewApp.js index a3e7da3c2f3..79ab68e793c 100644 --- a/server/sonar-web/src/main/js/apps/overview/components/OverviewApp.js +++ b/server/sonar-web/src/main/js/apps/overview/components/OverviewApp.js @@ -32,10 +32,9 @@ import { getMeasuresAndMeta } from '../../../api/measures'; import { getAllTimeMachineData } from '../../../api/time-machine'; import { enhanceMeasuresWithMetrics } from '../../../helpers/measures'; import { getLeakPeriod } from '../../../helpers/periods'; -import { TooltipsContainer } from '../../../components/mixins/tooltips-mixin'; import { getCustomGraph, getGraph } from '../../../helpers/storage'; import { METRICS, HISTORY_METRICS_LIST } from '../utils'; -import { getDisplayedHistoryMetrics } from '../../projectActivity/utils'; +import { DEFAULT_GRAPH, getDisplayedHistoryMetrics } from '../../projectActivity/utils'; import type { Component, History, MeasuresList, Period } from '../types'; import '../styles.css'; |