From 21df5beb3d4b7f4d996d82372c872b6cff392b83 Mon Sep 17 00:00:00 2001 From: Araq Date: Sat, 13 Sep 2014 17:59:37 +0200 Subject: [PATCH] resolved conflict --- src/wrappers/sqlite3.nim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wrappers/sqlite3.nim b/src/wrappers/sqlite3.nim index c8bce712d9..e3a3fa0b8e 100644 --- a/src/wrappers/sqlite3.nim +++ b/src/wrappers/sqlite3.nim @@ -88,8 +88,8 @@ const SQLITE_REINDEX* = 27 SQLITE_DENY* = 1 SQLITE_IGNORE* = 2 # Original from sqlite3.h: - ##define SQLITE_STATIC ((void(*)(void *))0) - ##define SQLITE_TRANSIENT ((void(*)(void *))-1) + #define SQLITE_STATIC ((void(*)(void *))0) + #define SQLITE_TRANSIENT ((void(*)(void *))-1) SQLITE_DETERMINISTIC* = 0x800 const