From 6bd3b0ebb0497cf4d74a4e0c48848c6ae9689102 Mon Sep 17 00:00:00 2001 From: Francesc Justicia Date: Mon, 7 Sep 2026 11:20:47 +0200 Subject: [PATCH 1/5] =?UTF-8?q?A=C3=B1ade=20la=20primera=20parte=20de=20la?= =?UTF-8?q?=20funcionalidad?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- funcion1.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 funcion1.txt diff --git a/funcion1.txt b/funcion1.txt new file mode 100644 index 00000000..e69de29b From 7d6d57d9730e699f50058fd7e1297e45d99eda6c Mon Sep 17 00:00:00 2001 From: Francesc Justicia Date: Mon, 7 Sep 2026 11:21:17 +0200 Subject: [PATCH 2/5] Completa la nueva funcionalidad --- .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..e69de29b From f0ec2ac0a46e56e068768f653b0ef1954ffe2395 Mon Sep 17 00:00:00 2001 From: Francesc Justicia Date: Mon, 7 Sep 2026 16:33:15 +0200 Subject: [PATCH 3/5] Arregla .gitignore y elimina archivos sensibles del seguimiento --- carpetaSecreta/password | 1 - configuracion | 2 -- 2 files changed, 3 deletions(-) delete mode 100644 carpetaSecreta/password delete mode 100644 configuracion diff --git a/carpetaSecreta/password b/carpetaSecreta/password deleted file mode 100644 index 1fa4b800..00000000 --- a/carpetaSecreta/password +++ /dev/null @@ -1 +0,0 @@ -pass: 1234 \ No newline at end of file diff --git a/configuracion b/configuracion deleted file mode 100644 index 81f237ad..00000000 --- a/configuracion +++ /dev/null @@ -1,2 +0,0 @@ -PC:local -URL:localhost \ No newline at end of file From 7d9aca0abe04034a6915ec0be0c1f81f02ab4f87 Mon Sep 17 00:00:00 2001 From: Francesc Justicia Date: Mon, 7 Sep 2026 18:07:29 +0200 Subject: [PATCH 4/5] Fuerza el contenido correcto de .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e69de29b..5e5effab 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,3 @@ +Secreta/ +password +configuracion \ No newline at end of file From 11e000a6d2a94214f46f3705b09797c4b8330c97 Mon Sep 17 00:00:00 2001 From: Francesc Justicia Date: Mon, 7 Sep 2026 18:24:15 +0200 Subject: [PATCH 5/5] Ajuste final antes de fusionar --- funcion1.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/funcion1.txt b/funcion1.txt index e69de29b..572bb309 100644 --- a/funcion1.txt +++ b/funcion1.txt @@ -0,0 +1,3 @@ +Empezamos el trabajo final. +Vamos a hacer algun cambio. +Probando cosas nuevas. \ No newline at end of file