From f1f14bc487c649d90e54c0d14f5e7511314351f7 Mon Sep 17 00:00:00 2001 From: mjalalzai <33738574+MForensic@users.noreply.github.com> Date: Wed, 22 Mar 2023 20:45:15 -0700 Subject: [PATCH] Merge remote-tracking branch 'origin/UnhappyPathAndPaceMaker' into UnhappyPathAndPaceMaker # Conflicts: # carnot/spec.md --- carnot/spec.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/carnot/spec.md b/carnot/spec.md index ab869f6..fb29853 100644 --- a/carnot/spec.md +++ b/carnot/spec.md @@ -449,7 +449,7 @@ def increment_view_timeout_qc (timeout_qc: Timeout_qc): if timeout_qc==None or timeout_qc.view < CURRENT_VIEW: return false LAST_VIEW_TIMEOUT_QC = timeout_qc - start_timer(qc.view+1) + start_timer(timeout_qc.view+1) return true ```