Merge branch 'neuer-branch' into Dev

2024-06-07 13:26:10 +02:00
parent 11a5fe0393 4b7a74647a
commit d5b73f8166
15 changed files with 1739 additions and 9 deletions
--- a/pages/api/[...path].js
+++ b/pages/api/[...path].js
@@ -3,7 +3,11 @@ import { createProxyMiddleware } from "http-proxy-middleware";

 export default createProxyMiddleware({
  //target: "http://192.168.10.58:3001",
+<<<<<<< HEAD
  target: "http://10.10.0.13", // Ziel-URL des Proxys,  GET //talas5/ClientData/WebserviceMap.asmx/GisStationsStatusDistrict?idMap=10&idUser=484 504 in 20ms
+=======
+  target: "http://10.10.0.13", // Ziel-URL des Proxys
+>>>>>>> neuer-branch
  //target: "http://localhost", // Ziel-URL des Proxys
  //target: "http://192.168.10.187:3000", // Ziel-URL des Proxys
  changeOrigin: true,