From: Donatas Abraitis Date: Sun, 2 Jun 2024 18:13:29 +0000 (+0300) Subject: Merge pull request #16142 from LabNConsulting/chopps/fix-conflict-workflow X-Git-Tag: base_10.1~23 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=41eb06801c47d957c24d6a14e116c958454d433a;p=matthieu%2Ffrr.git Merge pull request #16142 from LabNConsulting/chopps/fix-conflict-workflow ci: only run conflict check on pull-requests --- 41eb06801c47d957c24d6a14e116c958454d433a