From dee987b263b021b990ea4c62cb15be47c6d61fb5 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 05 Jan 2015 08:30:12 -0500
Subject: [PATCH] Merge branch 'master' into 'master'

---
 install/sql/incremental/upd_0042.sql |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/sql/incremental/upd_0042.sql b/install/sql/incremental/upd_0042.sql
index 8d1b7b4..1c195b5 100644
--- a/install/sql/incremental/upd_0042.sql
+++ b/install/sql/incremental/upd_0042.sql
@@ -1,4 +1,4 @@
 
 -- increase column size
-ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL DEFAULT '';
+ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL;
 

--
Gitblit v1.9.1