merge conflict

Azure · Oct 11, 2024 · 1a1130c · 1a1130c
1 parent efbd07e
commit 1a1130c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/azurelinuxagent/ga/logcollector.py b/azurelinuxagent/ga/logcollector.py
@@ -27,7 +27,7 @@
 from heapq import heappush, heappop
 
 from azurelinuxagent.common.conf import get_lib_dir, get_ext_log_dir, get_agent_log_file
-from azurelinuxagent.common.event import initialize_event_logger_vminfo_common_parameters, add_event, WALAEventOperation
+from azurelinuxagent.common.event import initialize_event_logger_vminfo_common_parameters_and_protocol, add_event, WALAEventOperation
 from azurelinuxagent.common.future import ustr
 from azurelinuxagent.ga.logcollector_manifests import MANIFEST_NORMAL, MANIFEST_FULL