[Swan-commit] Changes to ref refs/heads/main

[Andrew Cagney]

New commits:
commit 970f708b8780dce3a4940520f48fb9a8f28be0a6
Author: Andrew Cagney <cagney at gnu.org>
Date:   Tue Apr 25 12:57:08 2023 -0400

    kernel: ignore conflict when it's the connection's template