Check for merge conflicts

Fix typo in sysinfo CONFIG_NF_CONNTRACK_IPV4/IPV6 description #2994

# to view logs

Summary
Jobs
- main
Run details
- Usage
- Workflow file

Triggered via pull request January 2, 2025 14:38

tmalaher

synchronize #5395

Status Success

Total duration 11s

Artifacts –

conflicts.yaml

on: pull_request_target

Annotations

1 warning

ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636