fixed conflicts and add removed files in delete_files.txt
This commit is contained in:
parent
36dd93701a
commit
43cd308ef1
|
@ -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
|
Loading…
Reference in New Issue