diff options
| author | Christian Grothoff <christian@grothoff.org> | 2018-08-14 11:17:30 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2018-08-14 11:17:30 +0200 |
| commit | 5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9 (patch) | |
| tree | 33d2a86abe831bfd3cd711ad7332433b35891766 /src/peerinfo | |
| parent | 97e72521285a2ff2189334cb43d0a8f385d73e4a (diff) | |
| parent | 4cc09ba10da89ac32b4a40bde9abbe77bba21c78 (diff) | |
| download | gnunet-5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9.tar.gz gnunet-5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9.zip | |
resolve merge conflict with peerinfo plugin move
Diffstat (limited to 'src/peerinfo')
| -rw-r--r-- | src/peerinfo/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index 926b9ae94..ef79d6720 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am | |||
| @@ -25,7 +25,6 @@ libgnunetpeerinfo_la_SOURCES = \ | |||
| 25 | libgnunetpeerinfo_la_LIBADD = \ | 25 | libgnunetpeerinfo_la_LIBADD = \ |
| 26 | $(top_builddir)/src/hello/libgnunethello.la \ | 26 | $(top_builddir)/src/hello/libgnunethello.la \ |
| 27 | $(top_builddir)/src/util/libgnunetutil.la \ | 27 | $(top_builddir)/src/util/libgnunetutil.la \ |
| 28 | $(top_builddir)/src/json/libgnunetjson.la \ | ||
| 29 | $(XLIB) \ | 28 | $(XLIB) \ |
| 30 | $(LTLIBINTL) | 29 | $(LTLIBINTL) |
| 31 | libgnunetpeerinfo_la_LDFLAGS = \ | 30 | libgnunetpeerinfo_la_LDFLAGS = \ |