c07fe6d0df
Trivial conflict solved in merge and include net/if_arp.h added. |
||
---|---|---|
.. | ||
hostnamectl.c | ||
hostnamed.c | ||
meson.build | ||
org.freedesktop.hostname1.conf | ||
org.freedesktop.hostname1.policy | ||
org.freedesktop.hostname1.service |