From 05beae43cfeb15ea89b984d36105dcdbdffd0975 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 09:16:34 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master
---
install/sql/incremental/upd_0037.sql | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/install/sql/incremental/upd_0037.sql b/install/sql/incremental/upd_0037.sql
index dcf89cc..cd904e0 100644
--- a/install/sql/incremental/upd_0037.sql
+++ b/install/sql/incremental/upd_0037.sql
@@ -1,4 +1,4 @@
--- --------------------------------------------------------
+-- --------------------------------------------------------
ALTER TABLE `client` ADD `limit_cgi` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `web_php_options`,
ADD `limit_ssi` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_cgi`,
--
Gitblit v1.9.1