From b2bf4116085905aa42a93f0f5c96795fbace0800 Mon Sep 17 00:00:00 2001 From: Tatiana Llorente Date: Wed, 6 Mar 2019 08:59:41 +0100 Subject: [PATCH] Resolve conflict with install.php - #3432 Former-commit-id: 7b082b9f2f4aaae5dd2218abc6ae67d17640735e --- pandora_console/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/install.php b/pandora_console/install.php index 3ddfc53185..59813735b8 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@