Skip to content

Commit 846ffdb

Browse files
committed
fix merge with main branch conflicts
1 parent 58be6f2 commit 846ffdb

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

redisinsight/ui/src/constants/dbAnalysisRecommendations.json

Whitespace-only changes.

redisinsight/ui/src/utils/recommendation/utils.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
} from '@elastic/eui'
1111
import { SpacerSize } from '@elastic/eui/src/components/spacer/spacer'
1212
import cx from 'classnames'
13-
import { IRecommendationsStatic, IRecommendationContent ,IRecommendationContent } from 'uiSrc/slices/interfaces/recommendations'
13+
import { IRecommendationsStatic, IRecommendationContent } from 'uiSrc/slices/interfaces/recommendations'
1414
import { OAuthConnectFreeDb, OAuthSsoHandlerDialog } from 'uiSrc/components'
1515
import { OAuthSocialSource } from 'uiSrc/slices/interfaces'
1616
import { ReactComponent as CodeIcon } from 'uiSrc/assets/img/code-changes.svg'

0 commit comments

Comments
 (0)