diff --git a/projects/etos_suite_runner/requirements.txt b/projects/etos_suite_runner/requirements.txt index 3ef02bf..1c02a7b 100644 --- a/projects/etos_suite_runner/requirements.txt +++ b/projects/etos_suite_runner/requirements.txt @@ -18,17 +18,8 @@ PyScaffold==3.2.3 packageurl-python~=0.11 cryptography>=42.0.4,<43.0.0 -<<<<<<< HEAD -<<<<<<< HEAD -etos_lib==4.0.0 -etos_environment_provider~=4.1 -======= -etos_lib==4.1.1 -======= etos_lib==4.2.0 ->>>>>>> 11b187c (Code review changes) etos_environment_provider~=4.2 opentelemetry-api~=1.21 opentelemetry-exporter-otlp~=1.21 opentelemetry-sdk~=1.21 ->>>>>>> e187c17 (Add OpenTelemetry instrumentation)