From 4c749117a6e1eb8e27ed1e510a38ac0f500ca649 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 26 Apr 2021 13:29:13 +0800 Subject: [PATCH] * Fix bug. --- db/update15.0.rc3.sql | 4 +--- module/my/view/project.html.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/db/update15.0.rc3.sql b/db/update15.0.rc3.sql index 32c075db94..124a3ea4a3 100644 --- a/db/update15.0.rc3.sql +++ b/db/update15.0.rc3.sql @@ -1,6 +1,4 @@ -<<<<<<< 8f71af3835517e1753ce10785378aceafe5f8f91 ALTER TABLE `zt_webhook` CHANGE `projects` `executions` text NOT NULL; ALTER TABLE `zt_webhook` CHANGE `executions` `executions` text NOT NULL; -======= + ALTER TABLE `zt_repo` ADD `extra` char(30) COLLATE 'utf8_general_ci' NOT NULL AFTER `desc`; ->>>>>>> * Fix bug #12296. diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php index 83b0a663c4..d8f51b872e 100644 --- a/module/my/view/project.html.php +++ b/module/my/view/project.html.php @@ -91,7 +91,7 @@