Skip to content

Commit

Permalink
Rebase fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
frankkopp committed Jan 22, 2023
1 parent 007f9d1 commit 7fcf7e6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import { useSimVar } from '@instruments/common/simVars';
import Slider from 'rc-slider';
import { useHistory } from 'react-router-dom';
import { useInterval } from '@flybywiresim/react-components';
import { SimBridgeClientState } from '@simbridge/components/ClientState';
import { t } from '../translation';
import { TooltipWrapper } from '../UtilComponents/TooltipWrapper';
import { PowerStates, usePower } from '../Efb';
import { ClientState } from '../../../../simbridge-client/src';
import { SimBridgeClientState } from '../../../../simbridge-client/src/components/ClientState';

interface QuickSettingsButtonProps {
onClick: () => void;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { TooltipWrapper } from '../UtilComponents/TooltipWrapper';
import { BatteryStatus } from './BatteryStatus';
import { useAppSelector } from '../Store/store';
import { initialState } from '../Store/features/simBrief';
import { ClientState } from '@simbridge/index';
import { QuickControls } from './QuickControls';

interface StatusBarProps {
Expand Down

0 comments on commit 7fcf7e6

Please sign in to comment.