Resolve conflicts in catalog-info.yaml

elastic · Feb 6, 2024 · 3f572c8 · 3f572c8
1 parent 2500b41
commit 3f572c8
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/catalog-info.yaml b/catalog-info.yaml
@@ -130,15 +130,9 @@ spec:
       name: filebeat
       description: "Filebeat pipeline"
     spec:
-<<<<<<< HEAD
-      #      branch_configuration: "main 7.* 8.* v7.* v8.*" TODO: temporarily commented to build PRs from forks
-      pipeline_file: ".buildkite/filebeat/filebeat-pipeline.yml"
-      #      maximum_timeout_in_minutes: 120 TODO: uncomment when pipeline is ready
-=======
       branch_configuration: "main 7.* 8.* v7.* v8.*"
       pipeline_file: ".buildkite/filebeat/filebeat-pipeline.yml"
       maximum_timeout_in_minutes: 120
->>>>>>> 730dc87d0e (Filebeat pipeline migration to Buildkite (#37283))
       provider_settings:
         build_pull_request_forks: false
         build_pull_requests: true # requires filter_enabled and filter_condition settings as below when used with buildkite-pr-bot