From c3fe8a0b7a04bb0b27d69f60bb893264f77b30e0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 04 Jul 2013 08:19:00 -0400
Subject: [PATCH] Fix conflicts in last commit

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

diff --git a/SQL/mssql.initial.sql b/SQL/mssql.initial.sql
index e312cfb..9139509 100644
--- a/SQL/mssql.initial.sql
+++ b/SQL/mssql.initial.sql
@@ -371,6 +371,6 @@
     WHERE [contact_id] IN (SELECT [contact_id] FROM deleted)
 GO
 
-INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2013011000.sql')
+INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2013011700')
 GO
 
\ No newline at end of file

--
Gitblit v1.9.1