resolve merge conflict with peerinfo plugin move

1 files changed, 8 insertions, 4 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 070ecc4ce..5eda765b1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -235,7 +235,6 @@ src/namestore/namestore_api_monitor.c
 src/namestore/plugin_namestore_flat.c
 src/namestore/plugin_namestore_postgres.c
 src/namestore/plugin_namestore_sqlite.c
-src/namestore/plugin_rest_namestore.c
 src/nat-auto/gnunet-nat-auto.c
 src/nat-auto/gnunet-nat-auto_legacy.c
 src/nat-auto/gnunet-nat-server.c
@@ -262,7 +261,6 @@ src/nse/nse_api.c
 src/peerinfo/gnunet-service-peerinfo.c
 src/peerinfo/peerinfo_api.c
 src/peerinfo/peerinfo_api_notify.c
-src/peerinfo/plugin_rest_peerinfo.c
 src/peerinfo-tool/gnunet-peerinfo.c
 src/peerinfo-tool/gnunet-peerinfo_plugins.c
 src/peerstore/gnunet-peerstore.c
@@ -297,8 +295,6 @@ src/reclaim/jwt.c
 src/reclaim/oidc_helper.c
 src/reclaim/plugin_gnsrecord_reclaim.c
 src/reclaim/plugin_reclaim_sqlite.c
-src/reclaim/plugin_rest_openid_connect.c
-src/reclaim/plugin_rest_reclaim.c
 src/reclaim/reclaim_api.c
 src/regex/gnunet-daemon-regexprofiler.c
 src/regex/gnunet-regex-profiler.c
@@ -314,6 +310,13 @@ src/regex/regex_internal_dht.c
 src/regex/regex_test_graph.c
 src/regex/regex_test_lib.c
 src/regex/regex_test_random.c
+src/rest-plugins/oidc_helper.c
+src/rest-plugins/plugin_rest_copying.c
+src/rest-plugins/plugin_rest_gns.c
+src/rest-plugins/plugin_rest_identity.c
+src/rest-plugins/plugin_rest_namestore.c
+src/rest-plugins/plugin_rest_openid_connect.c
+src/rest-plugins/plugin_rest_peerinfo.c
 src/rest/gnunet-rest-server.c
 src/rest/plugin_rest_copying.c
 src/rest/rest.c
@@ -329,6 +332,7 @@ src/rps/gnunet-service-rps_sampler.c
 src/rps/gnunet-service-rps_sampler_elem.c
 src/rps/gnunet-service-rps_view.c
 src/rps/rps_api.c
+src/rps/rps_test_lib.c
 src/rps/rps-test_util.c
 src/scalarproduct/gnunet-scalarproduct.c
 src/scalarproduct/gnunet-service-scalarproduct_alice.c