Skip to content

will add new log #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amoragues95 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

will add new log #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5681d4b
will add new log
amoragues95 Sep 9, 2022
962690a
add 2 logs
amoragues95 Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions mergeConflict.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
console.log("Modifico el console.log");
console.log("ESTE CAMBIO QUIERO QUE PASE");
Copy link
Owner Author

@amoragues95 amoragues95 Sep 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please only log with correct capitalization

5 changes: 4 additions & 1 deletion test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
// COmenzando las pruebas
console.log("Chau mundo")
console.log("Esta es mi primer feature");
console.log("Esta es mi segunda feature");
console.log("Esta es mi segunda feature");

console.log("ESTE CAMBIO QUIERO QUE PASE");
console.log("ESTE CAMBIO QUIERO QUE PASE 2");
Copy link
Owner Author

@amoragues95 amoragues95 Sep 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dont add useless logs