]> git.ipfire.org Git - thirdparty/systemd.git/commit - src/libsystemd-network/dhcp6-internal.h
Merge pull request #21805 from наб
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 18 Jan 2022 14:20:37 +0000 (15:20 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 18 Jan 2022 14:20:37 +0000 (15:20 +0100)
commit8513c34bece0b0cd69cb8669e4751f0cd3d28b7e
tree4c0152423ac7956acfe24acc995237c4d01721e9
parentba900c1719549f09bb388207e5b879af99423acc
parentaf319a4b14bd05cd4c8460487f2c6d7a31b35640
Merge pull request #21805 from наб

A trivial merge conflict was fixed manually.
src/kernel-install/50-depmod.install
src/kernel-install/kernel-install