Merge pull request #251032 from Kranzes/twingate-resolved
nixos/twingate: avoid conflicts with resolved
authored by Ilan Joselevich and committed by GitHub 2 years ago 49f76fea ef45c822