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 /configure.ac | |
| parent | 97e72521285a2ff2189334cb43d0a8f385d73e4a (diff) | |
| parent | 4cc09ba10da89ac32b4a40bde9abbe77bba21c78 (diff) | |
| download | gnunet-5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9.tar.gz gnunet-5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9.zip | |
resolve merge conflict with peerinfo plugin move
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 535ce0ffe..6a75b1ebf 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -1758,6 +1758,7 @@ src/vpn/vpn.conf | |||
| 1758 | src/zonemaster/Makefile | 1758 | src/zonemaster/Makefile |
| 1759 | src/zonemaster/zonemaster.conf | 1759 | src/zonemaster/zonemaster.conf |
| 1760 | src/rest/Makefile | 1760 | src/rest/Makefile |
| 1761 | src/rest-plugins/Makefile | ||
| 1761 | src/abe/Makefile | 1762 | src/abe/Makefile |
| 1762 | src/reclaim-attribute/Makefile | 1763 | src/reclaim-attribute/Makefile |
| 1763 | src/reclaim/Makefile | 1764 | src/reclaim/Makefile |