Skip to content
Merged
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
7 changes: 7 additions & 0 deletions _data/frisonis.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{
<<<<<<< HEAD
"emoji": ":)"
"introduction": "Hi, I'm a Phd student in Economic History at Carlos III University of Madrid. Glad to be here learning Git :)",
"computing": "Stata, R, a bit of Python",
"institutions": "University of Bologna, Carlos III University of Madrid, University of Lund"
=======
"emoji": "😄"
"introduction": "Hi, here is Simone :) Curious about history and nature. I'm a graduate in Development Economics and a PhD student in Economic History at Universidad Carlos III de Madrid.",
"computing": "Stata, R, a bit of Python and Matlab",
"institution": "Carlos III University of Madrid"
>>>>>>> e977242 (Add my intro data)
}