From 76c9c7c461fb27e3050958cb52e5cba8a4582193 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 12 Jul 2020 19:02:45 +0100
Subject: [PATCH] fix spurious conflicts

---
 templates/script.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 :-/
-- 
2.30.2