Sie suchten nach: resolved (Holländisch - Englisch)

resolved (opgelost)
resolved

the problem is resolved.
the problem is resolved.

we have noted this to be resolved.
we have noted this to be resolved.

conflictstatus van %1 opgelost (resolved).
resolved conflicted state of %1.

we hebben nu dezelfde merge conflict zoals verwacht, maar kijk eens naar de regel met resolved file using previous resolution.
now, we got the same merge conflict like we expected, but take a look at the resolved file using previous resolution line.

daytime processing may be extended and the closing time thereby delayed if an ssp failure has occurred during the day but has been resolved before 18.00 .
daytime processing may be extended and the closing time thereby delayed if an ssp failure has occurred during the day but has been resolved before 18.00 .

the closing time shall be delayed in cases where an ssp failure has occurred before 18:00 and has not been resolved by 18.00 .
the closing time shall be delayed in cases where an ssp failure has occurred before 18:00 and has not been resolved by 18.00 .

( c ) the closing time shall be delayed in cases where an ssp failure has occurred before 18:00 and has not been resolved by 18.00 .
( c ) the closing time shall be delayed in cases where an ssp failure has occurred before 18:00 and has not been resolved by 18.00 .

je lost dit probleem op een vergelijkbare manier op: wijzig het bestand om het conflict op te lossen, stage het bestand en voer dan git am --resolved uit om door te gaan met de volgende patch:
you solve this issue much the same way – edit the file to resolve the conflict, stage the new file, and then run git am --resolved to continue to the next patch:

( b ) daytime processing may be extended and the closing time thereby delayed if an ssp failure has occurred during the day but has been resolved ( 1 ) cet takes into account the change to central european summer time .
( b ) daytime processing may be extended and the closing time thereby delayed if an ssp failure has occurred during the day but has been ( 1 ) cet takes into account the change to central european summer time .