From 71693d6d943ff5b0a25523818e3b694dcc2d12e4 Mon Sep 17 00:00:00 2001 From: MrHarvyson Date: Mon, 26 Dec 2022 22:45:22 +0100 Subject: [PATCH 01/14] Reto 0 Java --- .../java/MrHarvyson.java" | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 "Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" diff --git "a/Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" "b/Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" new file mode 100644 index 0000000000..02bd8893ff --- /dev/null +++ "b/Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" @@ -0,0 +1,28 @@ +package org.example; + +/* + * Escribe un programa que muestre por consola (con un print) los + * números de 1 a 100 (ambos incluidos y con un salto de línea entre + * cada impresión), sustituyendo los siguientes: + * - Múltiplos de 3 por la palabra "fizz". + * - Múltiplos de 5 por la palabra "buzz". + * - Múltiplos de 3 y de 5 a la vez por la palabra "fizzbuzz". + */ +public class FizzBuzz { + public static void main(String[] args) { + + for (int i = 1; i <= 100; i++) { + if (i % 3 == 0 && i % 5 == 0) { + System.out.println("fizzbuzz"); + }else if (i % 3 == 0) { + System.out.println("fizz"); + }else if(i % 5 == 0) { + System.out.println("buzz"); + }else{ + System.out.println(i); + } + } + + } + +} \ No newline at end of file From 102e63fe90b7a4d1a9c980bda25cd29635a6cbf8 Mon Sep 17 00:00:00 2001 From: MrHarvyson Date: Thu, 29 Dec 2022 23:08:28 +0100 Subject: [PATCH 02/14] . --- .idea/.gitignore | 8 ++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/php.xml | 12 ++++++++++++ .idea/vcs.xml | 6 ++++++ retos-programacion-2023.iml | 11 +++++++++++ 6 files changed, 51 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/php.xml create mode 100644 .idea/vcs.xml create mode 100644 retos-programacion-2023.iml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000000..13566b81b0 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000..639900d13c --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000000..3820ba75d1 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 0000000000..f5f27444bd --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000..35eb1ddfbb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/retos-programacion-2023.iml b/retos-programacion-2023.iml new file mode 100644 index 0000000000..9589732317 --- /dev/null +++ b/retos-programacion-2023.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file From 18738e359c89adc755d2e871f4434d32434b133c Mon Sep 17 00:00:00 2001 From: MrHarvyson Date: Thu, 29 Dec 2022 23:08:28 +0100 Subject: [PATCH 03/14] Revert "." This reverts commit 102e63fe90b7a4d1a9c980bda25cd29635a6cbf8. From 58564975cc859b83648db80bf14d8e7430874800 Mon Sep 17 00:00:00 2001 From: MrHarvyson Date: Mon, 26 Dec 2022 22:45:22 +0100 Subject: [PATCH 04/14] Revert "Reto 0 Java" This reverts commit 71693d6d943ff5b0a25523818e3b694dcc2d12e4. --- .../java/MrHarvyson.java" | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 "Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" diff --git "a/Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" "b/Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" deleted file mode 100644 index 02bd8893ff..0000000000 --- "a/Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" +++ /dev/null @@ -1,28 +0,0 @@ -package org.example; - -/* - * Escribe un programa que muestre por consola (con un print) los - * números de 1 a 100 (ambos incluidos y con un salto de línea entre - * cada impresión), sustituyendo los siguientes: - * - Múltiplos de 3 por la palabra "fizz". - * - Múltiplos de 5 por la palabra "buzz". - * - Múltiplos de 3 y de 5 a la vez por la palabra "fizzbuzz". - */ -public class FizzBuzz { - public static void main(String[] args) { - - for (int i = 1; i <= 100; i++) { - if (i % 3 == 0 && i % 5 == 0) { - System.out.println("fizzbuzz"); - }else if (i % 3 == 0) { - System.out.println("fizz"); - }else if(i % 5 == 0) { - System.out.println("buzz"); - }else{ - System.out.println(i); - } - } - - } - -} \ No newline at end of file From 108b3fb812c4b5528539934dee04c46bfb389aae Mon Sep 17 00:00:00 2001 From: MrHarvyson Date: Thu, 29 Dec 2022 23:34:40 +0100 Subject: [PATCH 05/14] Revert "Merge remote-tracking branch 'origin/main' into main" This reverts commit 48320d03c2a166ad8b677506d18a1d2e9dca251e. --- .idea/.gitignore | 8 -------- .idea/misc.xml | 6 ------ .idea/modules.xml | 8 -------- .idea/php.xml | 12 ------------ .idea/vcs.xml | 6 ------ retos-programacion-2023.iml | 11 ----------- 6 files changed, 51 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/php.xml delete mode 100644 .idea/vcs.xml delete mode 100644 retos-programacion-2023.iml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b81b0..0000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 639900d13c..0000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 3820ba75d1..0000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index f5f27444bd..0000000000 --- a/.idea/php.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfbb..0000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/retos-programacion-2023.iml b/retos-programacion-2023.iml deleted file mode 100644 index 9589732317..0000000000 --- a/retos-programacion-2023.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file From db5e0a9fb3c9fade5d4184cf2e49e44714afe4bc Mon Sep 17 00:00:00 2001 From: MrHarvyson Date: Thu, 29 Dec 2022 23:41:36 +0100 Subject: [PATCH 06/14] correcion --- .idea/.gitignore | 8 ++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/php.xml | 12 ++++++++++++ .idea/vcs.xml | 6 ++++++ retos-programacion-2023.iml | 11 +++++++++++ 6 files changed, 51 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/php.xml create mode 100644 .idea/vcs.xml create mode 100644 retos-programacion-2023.iml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000000..13566b81b0 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000..639900d13c --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000000..3820ba75d1 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 0000000000..f5f27444bd --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000..35eb1ddfbb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/retos-programacion-2023.iml b/retos-programacion-2023.iml new file mode 100644 index 0000000000..9589732317 --- /dev/null +++ b/retos-programacion-2023.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file From bbc3c34355e9bf09b89255dfce54b0f4d5afdc5c Mon Sep 17 00:00:00 2001 From: MrHarvyson Date: Mon, 26 Dec 2022 22:45:22 +0100 Subject: [PATCH 07/14] Revert "Revert "Reto 0 Java"" This reverts commit 58564975cc859b83648db80bf14d8e7430874800. --- .../java/MrHarvyson.java" | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 "Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" diff --git "a/Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" "b/Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" new file mode 100644 index 0000000000..02bd8893ff --- /dev/null +++ "b/Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" @@ -0,0 +1,28 @@ +package org.example; + +/* + * Escribe un programa que muestre por consola (con un print) los + * números de 1 a 100 (ambos incluidos y con un salto de línea entre + * cada impresión), sustituyendo los siguientes: + * - Múltiplos de 3 por la palabra "fizz". + * - Múltiplos de 5 por la palabra "buzz". + * - Múltiplos de 3 y de 5 a la vez por la palabra "fizzbuzz". + */ +public class FizzBuzz { + public static void main(String[] args) { + + for (int i = 1; i <= 100; i++) { + if (i % 3 == 0 && i % 5 == 0) { + System.out.println("fizzbuzz"); + }else if (i % 3 == 0) { + System.out.println("fizz"); + }else if(i % 5 == 0) { + System.out.println("buzz"); + }else{ + System.out.println(i); + } + } + + } + +} \ No newline at end of file From 56316d421b27bc6a85ddfc26727bd9688ca26b1d Mon Sep 17 00:00:00 2001 From: MrHarvyson Date: Thu, 29 Dec 2022 23:47:44 +0100 Subject: [PATCH 08/14] Reto #0 java --- .../java/MrHarvyson.java" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" "b/Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" index 02bd8893ff..67e0bf7318 100644 --- "a/Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" +++ "b/Retos/Reto #0 - EL FAMOSO FIZZ BUZZ [F\303\241cil]/java/MrHarvyson.java" @@ -8,7 +8,7 @@ * - Múltiplos de 5 por la palabra "buzz". * - Múltiplos de 3 y de 5 a la vez por la palabra "fizzbuzz". */ -public class FizzBuzz { +public class MrHarvyson { public static void main(String[] args) { for (int i = 1; i <= 100; i++) { From 534860d163732fa349ef75cecb8926a0d0d8b698 Mon Sep 17 00:00:00 2001 From: MrHarvyson Date: Thu, 29 Dec 2022 23:50:21 +0100 Subject: [PATCH 09/14] Delete .gitignore --- .idea/.gitignore | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .idea/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b81b0..0000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml From ca47ee991d6941f4c882c643b1ac02313a68c6a6 Mon Sep 17 00:00:00 2001 From: MrHarvyson Date: Thu, 29 Dec 2022 23:51:55 +0100 Subject: [PATCH 10/14] Delete retos-programacion-2023.iml --- retos-programacion-2023.iml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 retos-programacion-2023.iml diff --git a/retos-programacion-2023.iml b/retos-programacion-2023.iml deleted file mode 100644 index 9589732317..0000000000 --- a/retos-programacion-2023.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file From 7a6682e97a9bde4d8e4f7d504a6d96fdfd9a003c Mon Sep 17 00:00:00 2001 From: MrHarvyson Date: Thu, 29 Dec 2022 23:52:23 +0100 Subject: [PATCH 11/14] Delete misc.xml --- .idea/misc.xml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .idea/misc.xml diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 639900d13c..0000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 261297da7aa87b0040f080b170fe326e671d0d22 Mon Sep 17 00:00:00 2001 From: MrHarvyson Date: Thu, 29 Dec 2022 23:53:03 +0100 Subject: [PATCH 12/14] Auto stash before merge of "main" and "origin/main" --- .idea/misc.xml | 6 +++++ .idea/workspace.xml | 56 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 .idea/misc.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000..e3a9e45ae5 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000000..380d2703d0 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 1672353886287 + + + + + + \ No newline at end of file From 8a68cb1991f8f894648384ce93e59da198260349 Mon Sep 17 00:00:00 2001 From: MrHarvyson Date: Thu, 29 Dec 2022 23:56:18 +0100 Subject: [PATCH 13/14] . --- .idea/workspace.xml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 380d2703d0..d743af88f7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,8 +5,7 @@ - - + - { + "keyToString": { + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "WebServerToolWindowFactoryState": "false", + "node.js.detected.package.eslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "vue.rearranger.settings.migration": "true" } -}]]> +} @@ -46,7 +47,8 @@ From 09f3dfa2b7c4d3e1c65d9e58536ea4ffb3dbcc62 Mon Sep 17 00:00:00 2001 From: MrHarvyson Date: Thu, 29 Dec 2022 23:57:46 +0100 Subject: [PATCH 14/14] . --- .idea/misc.xml | 6 ----- .idea/modules.xml | 8 ------- .idea/php.xml | 12 ---------- .idea/vcs.xml | 6 ----- .idea/workspace.xml | 58 --------------------------------------------- 5 files changed, 90 deletions(-) delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/php.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index e3a9e45ae5..0000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 3820ba75d1..0000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index f5f27444bd..0000000000 --- a/.idea/php.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfbb..0000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index d743af88f7..0000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - { - "keyToString": { - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "WebServerToolWindowFactoryState": "false", - "node.js.detected.package.eslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "vue.rearranger.settings.migration": "true" - } -} - - - - - 1672353886287 - - - - - - \ No newline at end of file