From d04e727f022a4e2940ece2e7a6cbe17c1b09f17d Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Wed, 14 May 2025 06:35:39 +0200
Subject: [PATCH 1/2] Adjusted values in env.json

---
 env.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/env.json b/env.json
index a9b8660..a70eede 100644
--- a/env.json
+++ b/env.json
@@ -1,9 +1,9 @@
 {
     "vars": {
-        "OG_BOOT_API_URL": "192.168.68.51:8082",
-        "OG_DHCP_API_URL": "192.168.68.51:8081",
-        "OG_CORE_IP": "192.168.68.62",
-        "OG_LOG_IP": "192.168.68.51",
+        "OG_BOOT_API_URL": "127.0.0.1:8082",
+        "OG_DHCP_API_URL": "127.0.0.1:8081",
+        "OG_CORE_IP": "127.0.0.1",
+        "OG_LOG_IP": "127.0.0.1",
         "UDS_AUTH_LOGIN": "test",
         "UDS_AUTH_USERNAME": "test",
         "UDS_AUTH_PASSWORD": "test",

From 527383bce16c1a7033beeda74373d1b28fc620b2 Mon Sep 17 00:00:00 2001
From: Manuel Aranda <maranda@qindel.com>
Date: Wed, 14 May 2025 13:28:02 +0200
Subject: [PATCH 2/2] solve conflicts

---
 CHANGELOG.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9422a7c..cc07a70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,4 @@
 # Changelog
-<<<<<<< HEAD
 ## [0.12.0] - 2025-05-13
 ### Added
 - Se ha añadido nueva API para poder gestionar las tareas y acciones programadas.
@@ -12,11 +11,11 @@
 ## Fixed
 - Se ha corregido el bug en la creacion de clientes masivos donde no se le asignaba la plantilla PXE.
 - Se ha corregido un bug en el DTO de clientes, que hacia que PHP diera un timeout por bucle infinito.
-=======
+
+---
 ## [0.11.2] - 2025-04-23
 ### Fixed
 - Se ha cambiado la forma en guardar la fecha al recibir "ping" de los clientes. 
->>>>>>> main
 
 ---
 ## [0.11.1] - 2025-04-16