diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 14:50:48 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 14:50:48 -0400 |
| commit | 8ab6d6ae4a1fbefe7c772a8513e5d5a38f49a302 (patch) | |
| tree | 20000a90a738370fff9e44c5e8fbaccea08e949c /src/resolve/src/resolved-link.c | |
| parent | 7308e9ffd1933c71e6134e1b9632683977a12f47 (diff) | |
| parent | db51244983a38d901fefd5e2a090f0e66343d98d (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# am-pretty.mk
# config.mk.in
# src/journal/Makefile
# src/kernel-install/Makefile
# src/libbasic/Makefile
# src/libfirewall/Makefile
# src/libshared/Makefile
# src/libsystemd/Makefile
# src/libsystemd/libsystemd-internal/Makefile
# src/libsystemd/libsystemd-journal-internal/Makefile
# src/libsystemd/src/Makefile
# src/systemd-nspawn/Makefile
# src/systemd-nspawn/nspawn-network.c
# src/udev/udev.h
Diffstat (limited to 'src/resolve/src/resolved-link.c')
| -rw-r--r-- | src/resolve/src/resolved-link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resolve/src/resolved-link.c b/src/resolve/src/resolved-link.c index c5863b3aa2..65df95bb1f 100644 --- a/src/resolve/src/resolved-link.c +++ b/src/resolve/src/resolved-link.c @@ -19,7 +19,7 @@ #include <net/if.h> -#include "sd-network.h" +#include <systemd/sd-network.h> #include "alloc-util.h" #include "missing.h" |