mirror of
https://github.com/yu-i-i/overleaf-cep.git
synced 2026-11-12 21:23:45 +01:00
GitLab Synchronization: Fixed v6.3.0 rebase related errors
This commit is contained in:
+2
-2
@@ -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 })}
|
||||
/>
|
||||
|
||||
Reference in New Issue
Block a user