From 25a244908b21b097f744c7194e4862ca6ebda391 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 16 Jan 2014 05:43:11 -0500
Subject: [PATCH] Remove merge conflict

---
 SQL/sqlite.initial.sql |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql
index 28a4368..e7f74dd 100644
--- a/SQL/sqlite.initial.sql
+++ b/SQL/sqlite.initial.sql
@@ -126,7 +126,7 @@
   user_id integer NOT NULL default 0,
   cache_key varchar(128) NOT NULL default '',
   created datetime NOT NULL default '0000-00-00 00:00:00',
-  expires datetime DEFAULT NOT,
+  expires datetime DEFAULT NULL,
   data text NOT NULL
 );
 

--
Gitblit v1.9.1