mirror of
https://github.com/nim-lang/Nim.git
synced 2026-08-09 08:40:59 +00:00
merge conflict problem
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user