From 5681d4bfff8a823281654cdcf0f3626f7e1e3161 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 9 Sep 2022 11:36:53 -0300 Subject: [PATCH 1/2] will add new log --- test.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test.js b/test.js index 47ff1b2..d21867f 100644 --- a/test.js +++ b/test.js @@ -1,4 +1,6 @@ // COmenzando las pruebas console.log("Chau mundo") console.log("Esta es mi primer feature"); -console.log("Esta es mi segunda feature"); \ No newline at end of file +console.log("Esta es mi segunda feature"); + +console.log("ESTE CAMBIO QUIERO QUE PASE"); \ No newline at end of file From 962690ab33630d95a815d66c482ef41bdedf782f Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 9 Sep 2022 11:38:49 -0300 Subject: [PATCH 2/2] add 2 logs --- mergeConflict.js | 1 + test.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mergeConflict.js b/mergeConflict.js index e812ad4..4ffba6f 100644 --- a/mergeConflict.js +++ b/mergeConflict.js @@ -1 +1,2 @@ console.log("Modifico el console.log"); +console.log("ESTE CAMBIO QUIERO QUE PASE"); diff --git a/test.js b/test.js index d21867f..14bbcca 100644 --- a/test.js +++ b/test.js @@ -3,4 +3,5 @@ console.log("Chau mundo") console.log("Esta es mi primer feature"); console.log("Esta es mi segunda feature"); -console.log("ESTE CAMBIO QUIERO QUE PASE"); \ No newline at end of file +console.log("ESTE CAMBIO QUIERO QUE PASE"); +console.log("ESTE CAMBIO QUIERO QUE PASE 2");