Skip to content
Open
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions your-code/about-me.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
NEW BRANCH - MODIFIED TO PROVOKE A CONFLICT, FIXED AFTERWARDS ----

Carla is a passionate, honest, web developer musician and financier.
Eduardo passionate about coding, current finishing WebDev and starting Python.

Learning the new tech world lingo and pursuing all passions while trying to watch all the top 250 movies she can find.


<!-- Carla is a passionate, honest, web developer musician and financier.

Learning the new tech world lingo and pursuing all passions while trying to watch all the top 250 movies she can find. -->