From e32e6160312d199290797fb67a5d59435786b228 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 15 May 2017 22:58:13 -0700 Subject: resolve merge conflict --- install/update.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install/update.php') diff --git a/install/update.php b/install/update.php index ca347e4c2..06084a422 100644 --- a/install/update.php +++ b/install/update.php @@ -2475,7 +2475,7 @@ function update_r1184() { function update_r1185() { - $r1 = q("alter table app add app_plugin char(255) not null default '' "); + $r1 = q("alter table app add app_plugin text not null default '' "); if($r1) return UPDATE_SUCCESS; @@ -2523,7 +2523,7 @@ function update_r1188() { function update_r1189() { - $r1 = q("alter table mail add mail_mimetype char(64) not null default 'text/bbcode' "); + $r1 = q("alter table mail add mail_mimetype varchar(64) not null default 'text/bbcode' "); $r2 = q("alter table mail add mail_raw int(4) not null default '0' "); if($r1 && $r2) -- cgit v1.2.3