diff options
author | Christian Poessinger <christian@poessinger.com> | 2022-04-04 13:32:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-04 13:32:53 +0200 |
commit | 1678ecdc7bff0ac89b8dfd6608097156f92b9f3a (patch) | |
tree | 851e4597f3581ff27b4a53092bd85e5089948bcf /data | |
parent | adda3d86080bb3b8fe26424c7d829e40eb9e2b23 (diff) | |
parent | 035bc9588d319ef8db434fb06caaad2df8eb2a19 (diff) | |
download | vyos-1x-1678ecdc7bff0ac89b8dfd6608097156f92b9f3a.tar.gz vyos-1x-1678ecdc7bff0ac89b8dfd6608097156f92b9f3a.zip |
Merge pull request #1266 from c-po/pr-conflict-backport
GitHub: enable PR conflict workflow - backport from current
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions