From ebdbdb0ca5829b80be28dfef00848edefef65973 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Sun, 19 Aug 2018 15:14:03 +0200
Subject: [PATCH] fixes merge conflict

---
 src/db_sqlite.nim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/db_sqlite.nim b/src/db_sqlite.nim
index fd25b2b941..a40c88a114 100644
--- a/src/db_sqlite.nim
+++ b/src/db_sqlite.nim
@@ -105,7 +105,6 @@ proc dbError*(db: DbConn) {.noreturn.} =
 
 proc dbQuote*(s: string): string =
   ## DB quotes the string.
-  if s.isNil: return "NULL"
   result = "'"
   for c in items(s):
     if c == '\'': add(result, "''")