From 43cd308ef15197e2dd5df22118fe1343e0f472d6 Mon Sep 17 00:00:00 2001 From: marcos Date: Fri, 18 Jun 2021 12:37:06 +0200 Subject: [PATCH] fixed conflicts and add removed files in delete_files.txt --- pandora_console/extras/delete_files/delete_files.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pandora_console/extras/delete_files/delete_files.txt b/pandora_console/extras/delete_files/delete_files.txt index 9221d762aa..d4c3b0adb8 100644 --- a/pandora_console/extras/delete_files/delete_files.txt +++ b/pandora_console/extras/delete_files/delete_files.txt @@ -89,4 +89,9 @@ godmode/update_manager/update_manager.offline.php godmode/update_manager/update_manager.online.php include/javascript/update_manager.js enterprise/include/functions_update_manager.php -include/ajax/rolling_release.ajax.php \ No newline at end of file +include/ajax/rolling_release.ajax.php +pandora_console/include/help/en/help_event_alert.php +pandora_console/include/help/es/help_event_alert.php +pandora_console/enterprise/godmode/alerts/alert_events.php +pandora_console/enterprise/godmode/alerts/alert_events_list.php +pandora_console/enterprise/godmode/alerts/alert_events_rules.php \ No newline at end of file