fixes merge conflict

2018-08-23 11:30:55 +02:00 · 2018-08-23 11:30:55 +02:00 · 30597e643f
commit 30597e643f
parent cb9e9297fb 55a8649749
40 changed files with 1844 additions and 1695 deletions
--- a/compiler/ast.nim
+++ b/compiler/ast.nim
@ -506,6 +506,7 @@ type
    tfGenericTypeParam
    tfImplicitTypeParam
    tfInferrableStatic
+    tfConceptMatchedTypeSym
    tfExplicit        # for typedescs, marks types explicitly prefixed with the
                      # `type` operator (e.g. type int)
    tfWildcard        # consider a proc like foo[T, I](x: Type[T, I])