resolve merge conflict

elastic · Aug 9, 2021 · d9abdf9 · d9abdf9
1 parent fa10c2d
commit d9abdf9
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/x-pack/elastic-agent/pkg/agent/program/supported.go b/x-pack/elastic-agent/pkg/agent/program/supported.go