From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 12 Jul 2020 18:02:45 +0000 (+0100)
Subject: fix spurious conflicts
X-Git-Tag: otter-0.2.0~1342
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=76c9c7c461fb27e3050958cb52e5cba8a4582193;p=otter.git

fix spurious conflicts
---

diff --git a/templates/script.ts b/templates/script.ts
index 2fb6fa9e..f9cef08c 100644
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -441,7 +441,7 @@ messages.Recorded = <MessageHandler>function
   let piece = j.piece;
   let p = pieces[piece]!;
   if (p.cseq != null && j.cseq >= p.cseq) {
-    p.cseq == null;
+    p.cseq = null;
   }
   if (j.zg != null) {
     var zg_new = j.zg; // type narrowing doesn't propagate :-/