관망도 페이지 import 병합 충돌 해소
This commit is contained in:
@@ -129,13 +129,8 @@ import FldngHstryDetailPanel from "./components/fldngHstry/FldngHstryDetailPanel
|
||||
import FldngHstryLayerSettingPanel from "./components/fldngHstry/FldngHstryLayerSettingPanel";
|
||||
import ExmnLayerSettingPanel from "./components/exmn/ExmnLayerSettingPanel";
|
||||
import LayerSettingCard from "./components/layerSetting/LayerSettingCard";
|
||||
<<<<<<< Updated upstream
|
||||
import { getExmnMapLayer } from "./components/exmn/exmnMapApi";
|
||||
import { useFloodPredictionMap } from "@/features/fldngPredcPrst/lib/use-flood-prediction-map";
|
||||
=======
|
||||
import { useExmnResultMap } from "./components/exmn/useExmnResultMap";
|
||||
import { getFloodRiskGradeClassName } from "@/features/fldngPredcPrst/ui/FldngPredcPrstPopupContent";
|
||||
>>>>>>> Stashed changes
|
||||
import {
|
||||
EMPTY_EXMN_MAP_FILTERS,
|
||||
appendExmnResultControlNodes,
|
||||
|
||||
Reference in New Issue
Block a user