resolved conflict

This commit is contained in:
Araq
2014-09-13 17:59:37 +02:00
committed by ringabout
parent 347b0fa0ba
commit 21df5beb3d

View File

@@ -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