chiark
/
gitweb
/
~ianmdlvl
/
otter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
56913ca
)
fix spurious conflicts
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 12 Jul 2020 18:02:45 +0000
(19:02 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 12 Jul 2020 18:02:45 +0000
(19:02 +0100)
templates/script.ts
patch
|
blob
|
history
diff --git
a/templates/script.ts
b/templates/script.ts
index 2fb6fa9e6488abb42298dfba6ed4648c8ffd7e3c..f9cef08c85855f24b1e2a731d4afde48407201e0 100644
(file)
--- 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 :-/