buildkite: package definition (#11399)

(cherry picked from commit 28541e9) # Conflicts: # catalog-info.yaml
elastic · Aug 17, 2023 · aa49634 · aa49634
1 parent 0d87753
commit aa49634
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/catalog-info.yaml b/catalog-info.yaml
@@ -32,7 +32,11 @@ spec:
     apiVersion: buildkite.elastic.dev/v1
     kind: Pipeline
     metadata:
+<<<<<<< HEAD
       name: apm-server-package
+=======
+      name: apm-server
+>>>>>>> 28541e96 (buildkite: package definition (#11399))
     spec:
       repository: elastic/apm-server
       pipeline_file: ".buildkite/package.yml"