Merge branch 'master' of https://github.com/lgadelha/lgadelha.github.io

lgadelha · Oct 23, 2024 · fa33bcf · fa33bcf
2 parents 0eabb71 + b42172f
commit fa33bcf
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/_config.yml b/_config.yml
@@ -259,13 +259,8 @@ display_categories: ['blockquotes'] # these categories will be displayed on the
 
 scholar:
 
-<<<<<<< HEAD
-  last_name: [Einstein]
-  first_name: [Albert, A.]
-=======
   last_name: Gadelha
   first_name: [Luiz, L.]
->>>>>>> d3157374 (Updated _config.yml)
 
   style: apa
   locale: en