From 0409f87d17a3a105d68bac0d08dd0c32115af2ba Mon Sep 17 00:00:00 2001 From: Fernando Date: Thu, 23 Jan 2025 21:57:27 +0100 Subject: [PATCH 1/4] =?UTF-8?q?A=C3=B1adir=20archivo=20.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ index.html | 0 style.css | 4 ++++ 3 files changed, 6 insertions(+) create mode 100644 .gitignore create mode 100644 index.html create mode 100644 style.css diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..552f221 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +node_modules/ +*.log diff --git a/index.html b/index.html new file mode 100644 index 0000000..e69de29 diff --git a/style.css b/style.css new file mode 100644 index 0000000..f3197a9 --- /dev/null +++ b/style.css @@ -0,0 +1,4 @@ +h2 { + color: aqua; + text-align: center; +} \ No newline at end of file From 4233889e5313eb2490d787896e7d1c92c2f1d22a Mon Sep 17 00:00:00 2001 From: Fernando Date: Thu, 23 Jan 2025 22:02:16 +0100 Subject: [PATCH 2/4] Add *.cache to .gitignore --- .gitignore | 1 + index.html | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 552f221..447c81d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules/ *.log +*.cache diff --git a/index.html b/index.html index e69de29..b66ba06 100644 --- a/index.html +++ b/index.html @@ -0,0 +1 @@ +new content From a5d144a899c3e56e40d1d154ca31365b460a456c Mon Sep 17 00:00:00 2001 From: Fernando Date: Thu, 23 Jan 2025 22:05:29 +0100 Subject: [PATCH 3/4] index.html --- index.html | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/index.html b/index.html index b66ba06..fab7dc9 100644 --- a/index.html +++ b/index.html @@ -1 +1,40 @@ +<<<<<<< Updated upstream new content +======= + + + + + Portfolio + + + + +

Welcome To Ironhacker's Page

+ +
+

Things I Like

+
    +
  • Fill
  • +
  • This
  • +
  • In
  • +
+
+ +
+

Things I Don't Like

+
    +
  • Fishss
  • +
  • Heights
  • +
  • Wind
  • +
+
+ + +>>>>>>> Stashed changes From 7a532cf1b076053a5e0fa6b06311c04ac7014476 Mon Sep 17 00:00:00 2001 From: Fernando Date: Thu, 23 Jan 2025 22:28:31 +0100 Subject: [PATCH 4/4] Prueba busqueda --- file1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file1.txt b/file1.txt index e69de29..ebaed77 100644 --- a/file1.txt +++ b/file1.txt @@ -0,0 +1 @@ +Prueba de busqueda para github \ No newline at end of file