function showNextConflict() {
    $('.mark-conflict-row').hide();
    $('.mark-conflict-row:not(.mark-resolved)').first().show();
    $('.conflict-resolve-progress-indicator').text(getNumResolvedConflicts() + 1);
}
/**
 * Shows the next unresolved mark conflict
 */
Shows the next unresolved mark conflict
Shows the next unresolved mark conflict
function showNextConflict() {
    $('.mark-conflict-row').hide();
    $('.mark-conflict-row:not(.mark-resolved)').first().show();
    $('.conflict-resolve-progress-indicator').text(getNumResolvedConflicts() + 1);
}
function showNextConflict ( ) { $ ( '.mark-conflict-row' ) . hide ( ) ; $ ( '.mark-conflict-row:not(.mark-resolved)' ) . first ( ) . show ( ) ; $ ( '.conflict-resolve-progress-indicator' ) . text ( getNumResolvedConflicts ( ) + 1 ) ; }
Shows the next unresolved mark conflict
Shows the next unresolved mark conflict