-
Dan Winship authored
Conflicts: src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c src/dhcp-manager/systemd-dhcp/src/shared/fileio.c src/dhcp-manager/systemd-dhcp/src/shared/util.c src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h
1ea0dd41