diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 00:06:45 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 00:06:45 -0400 |
| commit | a3e390abebfaeb7c2c8f57dcf721075e85801a4c (patch) | |
| tree | 52384648eb1383dc1bdf2916147f260cbccba71e /src/grp-resolve/systemd-resolved/Makefile | |
| parent | aab3aab0b571d8ebb3316808f7da91fda86fa180 (diff) | |
| parent | 7a901e86b9e5ae219ee5db89453864ff4ea19afd (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/systemd-nspawn/Makefile
Diffstat (limited to 'src/grp-resolve/systemd-resolved/Makefile')
| -rw-r--r-- | src/grp-resolve/systemd-resolved/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile index 67708841c0..49a995bd75 100644 --- a/src/grp-resolve/systemd-resolved/Makefile +++ b/src/grp-resolve/systemd-resolved/Makefile @@ -193,7 +193,7 @@ test_dnssec_complex_SOURCES = \ test_dnssec_complex_LDADD = \ libshared.la -endif +endif # ENABLE_RESOLVED gperf_txt_sources += \ src/resolve/dns_type-list.txt |