From d140659fcc50312fa8c2b6e12147f071f25b4183 Mon Sep 17 00:00:00 2001 From: Simone Frisoni Date: Sun, 13 Jul 2025 19:59:53 +0200 Subject: [PATCH] Update my intro data --- _data/frisonis.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/_data/frisonis.json b/_data/frisonis.json index 5ffaf69..fbb96ff 100644 --- a/_data/frisonis.json +++ b/_data/frisonis.json @@ -1,13 +1,6 @@ { -<<<<<<< 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) }