]> git.puffer.fish Git - matthieu/frr.git/commitdiff
Merge pull request #16142 from LabNConsulting/chopps/fix-conflict-workflow
authorDonatas Abraitis <donatas@opensourcerouting.org>
Sun, 2 Jun 2024 18:13:29 +0000 (21:13 +0300)
committerGitHub <noreply@github.com>
Sun, 2 Jun 2024 18:13:29 +0000 (21:13 +0300)
ci: only run conflict check on pull-requests


Trivial merge