GitLab Synchronization: Fixed v6.3.0 rebase related errors

This commit is contained in:
Florian Porrmann
2026-10-09 16:50:10 +02:00
parent fcb3d06f24
commit 565b793055
12 changed files with 35 additions and 35 deletions
@@ -5,7 +5,7 @@ import {
OLModalFooter,
} from '@/shared/components/ol/ol-modal'
import OLButton from '@/shared/components/ol/ol-button'
import OLNotification from '@/shared/components/ol/ol-notification'
import Notification from '@/shared/components/notification'
import { ProjectSyncState, GitSyncModalStatus } from '../../types/git-sync-types'
@@ -22,7 +22,7 @@ const GitSyncConflictModal = ({ projectSyncState, handleHide, setModalStatus }:
return (
<>
<OLModalBody>
<OLNotification
<Notification
type="warning"
content={t('gitlab_merge_failed_error', { appName })}
/>