From 8c93fc2229ed5a7fc109b8f9f411c72c6237c68e Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Mon, 4 Jun 2018 16:16:50 +0200
Subject: [PATCH] fixed merge conflict

---
 src/db_mysql.nim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/db_mysql.nim b/src/db_mysql.nim
index 3b461d2f6d..ca0e29d11b 100644
--- a/src/db_mysql.nim
+++ b/src/db_mysql.nim
@@ -128,7 +128,7 @@ proc dbFormat(formatstr: SqlQuery, args: varargs[string]): string =
   var a = 0
   for c in items(string(formatstr)):
     if c == '?':
-      if args[a] == nil:
+      if args[a].isNil:
         add(result, "NULL")
       else:
         add(result, dbQuote(args[a]))