Skip to content

Commit

Permalink
fix invisible merge conflict
Browse files Browse the repository at this point in the history
- it breaks on build and lint, but `git` wouldn't detect it as it's not part of the diff

Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
  • Loading branch information
agilgur5 committed Apr 24, 2024
1 parent 99d0251 commit dc40905
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {InfoIcon, WarningIcon} from '../../../shared/components/fa-icons';
import {Links} from '../../../shared/components/links';
import {Context} from '../../../shared/context';
import {useLocalStorage} from '../../../shared/use-local-storage';
import {getPodName} from '../../../shared/pod-name';
import {getPodName, getTemplateNameFromNode} from '../../../shared/pod-name';
import {ScopedLocalStorage} from '../../../shared/scoped-local-storage';
import {services} from '../../../shared/services';
import {FullHeightLogsViewer} from './full-height-logs-viewer';
Expand Down

0 comments on commit dc40905

Please sign in to comment.