From 777cb78c49934072779be916b97d19c7d8b8e74b Mon Sep 17 00:00:00 2001 From: Diego Altamirano Date: Thu, 9 Apr 2026 16:25:48 -0500 Subject: [PATCH 1/5] Cambio desde rama A --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9debd17..ae5f7ae 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - +"TITULO MODIFICADO POR RAMA A DIEGO ALTAMIRANO" # minGPT ![mingpt](mingpt.jpg) From 2a99e2de85da17a08d0ae9ec0ca3701e7e56c883 Mon Sep 17 00:00:00 2001 From: Diego Altamirano Date: Thu, 9 Apr 2026 16:28:13 -0500 Subject: [PATCH 2/5] Cambio desde rama B --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9debd17..070e0a6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - +"TITULO MODIFICADO POR RAMA B Marcelo Plazarte" # minGPT ![mingpt](mingpt.jpg) From 5dd2b481be7e7c4925a8f5c85e24bd3e78f0ea7b Mon Sep 17 00:00:00 2001 From: Diego Altamirano Date: Thu, 9 Apr 2026 16:39:07 -0500 Subject: [PATCH 3/5] Commit intencional para probar revert --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index bac1e5d..98f099e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,4 @@ -<<<<<<< HEAD -"TITULO MODIFICADO POR RAMA A DIEGO ALTAMIRANO" -======= -"TITULO MODIFICADO POR RAMA B Marcelo Plazarte" ->>>>>>> rama-b +"Título final decidido tras el conflicto Diego Marcelo Altamirano Plazarte" # minGPT ![mingpt](mingpt.jpg) From 9f301da7c983c29a3b17893857cad78fcaccc7c9 Mon Sep 17 00:00:00 2001 From: Diego Altamirano Date: Thu, 9 Apr 2026 16:47:33 -0500 Subject: [PATCH 4/5] Guardando cambios antes del revert --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 98f099e..62ff0ea 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +"ESTE ES UN CAMBIO QUE VOY A REVERTIR" "Título final decidido tras el conflicto Diego Marcelo Altamirano Plazarte" # minGPT From f1a80af1fdf9bfc440d2f7ece07576196b759836 Mon Sep 17 00:00:00 2001 From: Diego Altamirano Date: Thu, 9 Apr 2026 16:53:53 -0500 Subject: [PATCH 5/5] Revert "Commit intencional para probar revert" This reverts commit 5dd2b481be7e7c4925a8f5c85e24bd3e78f0ea7b. --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 62ff0ea..7daedf8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -"ESTE ES UN CAMBIO QUE VOY A REVERTIR" -"Título final decidido tras el conflicto Diego Marcelo Altamirano Plazarte" +Esto es el final luego del conflicto con revert # minGPT ![mingpt](mingpt.jpg)