From 61a2a14676467787c9e3a46c39cf80e8db8e30cd Mon Sep 17 00:00:00 2001
From: ringabout <43030857+ringabout@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:50:46 +0800
Subject: [PATCH] solve conflicts

---
 compiler/types.nim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compiler/types.nim b/compiler/types.nim
index dbdaab670f..30c761552f 100644
--- a/compiler/types.nim
+++ b/compiler/types.nim
@@ -39,6 +39,7 @@ type
     isSubtype,
     isSubrange,              # subrange of the wanted type; no type conversion
                              # but apart from that counts as ``isSubtype``
+    isVarConvertible,
     isBothMetaConvertible    # generic proc parameter was matched against
                              # generic type, e.g., map(mySeq, x=>x+1),
                              # maybe recoverable by rerun if the parameter is