Skip to content

Guillermo: Lab resolving git conflicts #6

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Guillermo: Lab resolving git conflicts #6

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
dfd0a5e
I entered some new information about myself.
Jan 23, 2025
a9ce446
this is my 3rd commit in this exercise. 1st was the one with the conf…
Jan 23, 2025
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
Empty file added FETCH_HEAD
View file
Open in desktop
Empty file.
7 changes: 4 additions & 3 deletions your-code/about-me.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@

# Who am I

* I was born in Venezuela but moved to Algarve when I was 13.
* I have a PhD in Neuroscience but have no intention of staying in academia.
* I have some experience analyzing data from my own experiments but no formal training whatsoever.
*I was born in Argentina but moved to Europe when I was 19.
*I a Masters in Media Arts and technology and also a Bachelor in Sound Engineering.
*I do not have experience analyzing data, but worked all my life with technology


# Why am I here

Expand Down