fixed conflicts and add removed files in delete_files.txt

This commit is contained in:
marcos 2021-06-18 12:37:06 +02:00
parent 36dd93701a
commit 43cd308ef1
1 changed files with 6 additions and 1 deletions

View File

@ -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
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