resolve merge conflict with peerinfo plugin move
authorChristian Grothoff <christian@grothoff.org>
Tue, 14 Aug 2018 09:17:30 +0000 (11:17 +0200)
committerChristian Grothoff <christian@grothoff.org>
Tue, 14 Aug 2018 09:17:30 +0000 (11:17 +0200)
commit5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9
tree33d2a86abe831bfd3cd711ad7332433b35891766
parent97e72521285a2ff2189334cb43d0a8f385d73e4a
parent4cc09ba10da89ac32b4a40bde9abbe77bba21c78
resolve merge conflict with peerinfo plugin move
src/peerinfo-tool/Makefile.am
src/peerinfo/Makefile.am