From afdbfd2c7e21b2beef9c1add4932924a15948c10 Mon Sep 17 00:00:00 2001
From: narimiran <narimiran@disroot.org>
Date: Tue, 31 Jan 2023 18:01:06 +0100
Subject: [PATCH] fix some merge conflict leftovers

---
 compiler/semexprs.nim | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 6794bae3fe..5212d5a0ad 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -2795,18 +2795,6 @@ proc semExpr(c: PContext, n: PNode, flags: TExprFlags = {}): PNode =
     defer:
       if isCompilerDebug():
         echo ("<", c.config$n.info, n, ?.result.typ)
-<<<<<<< HEAD
-=======
-  template directLiteral(typeKind: TTypeKind) =
-    if result.typ == nil:
-      if expectedType != nil and (
-          let expected = expectedType.skipTypes(abstractRange-{tyDistinct});
-          expected.kind == typeKind):
-        result.typ = expected
-        changeType(c, result, expectedType, check=true)
-      else:
-        result.typ = getSysType(c.graph, n.info, typeKind)
->>>>>>> 7031ea65c (Implemented basic macro expand functionality (#20579))
 
   result = n
   when defined(nimsuggest):