Fix internal error

This commit is contained in:
gpt-engineer-app[bot]
2025-11-03 02:17:37 +00:00
parent 9e02748067
commit 5a2c72ecd6
16 changed files with 67 additions and 52 deletions

View File

@@ -634,7 +634,10 @@ export function SubmissionReviewManager({
<ConflictResolutionModal
open={showConflictResolutionModal}
onOpenChange={setShowConflictResolutionModal}
conflictData={conflictData}
conflictData={conflictData || {
hasConflict: false,
clientVersion: { last_modified_at: new Date().toISOString() }
}}
onResolve={async (strategy) => {
if (strategy === 'keep-mine') {
// Log conflict resolution