merge conflict problem

This commit is contained in:
araq
2025-11-19 20:35:44 +01:00
parent d1a74b008d
commit 4d41a95fa9

View File

@@ -11,8 +11,6 @@
{.push overflowChecks: off, rangeChecks: off.}
{.push overflowChecks: off, rangeChecks: off.}
template isLiteral(s): bool = (s.p == nil) or (s.p.cap and strlitFlag) == strlitFlag
template contentSize(cap): int = cap + 1 + sizeof(NimStrPayloadBase)