Skip to content

Commit 958395e

Browse files
committed
correct resolving merge conflict with pr
1 parent 8c5458d commit 958395e

File tree

1 file changed

+1
-1
lines changed
  • src/packages/frontend/project/page/flyouts

1 file changed

+1
-1
lines changed

src/packages/frontend/project/page/flyouts/header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { capitalize } from "@cocalc/util/misc";
2020
import { COLORS } from "@cocalc/util/theme";
2121
import { FIX_BORDER } from "../common";
2222
import { FIXED_PROJECT_TABS, FixedTab } from "../file-tab";
23-
import { FIXED_TABS_BG_COLOR } from "../tabs";
23+
import { FIXED_TABS_BG_COLOR } from "../vertical-fixed-tabs";
2424
import { ActiveHeader } from "./active-header";
2525
import { FLYOUT_PADDING } from "./consts";
2626
import { LogHeader } from "./log-header";

0 commit comments

Comments
 (0)