Skip to content

Commit

Permalink
Resolved merge conflict by incorporating both suggestions.
Browse files Browse the repository at this point in the history
  • Loading branch information
Afonso-santos committed Sep 24, 2023
2 parents 068e820 + 0bd2968 commit 90889b1
Showing 1 changed file with 68 additions and 0 deletions.
68 changes: 68 additions & 0 deletions apps/web/data/hall_of_fame.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
[

{
"picture": "guardapedropereira.jpg",
"name": "Pedro Pereira",
"role": "Champion atual"
},
{
"picture": "jess.jpg",
"name": "Jéssica Fernandes",
"role": "Champion 2022/23"
},
{
"picture": "filipefelicio.jpg",
"name": "Filipe Felício",
"role": "Champion 2021/22"
},
{
"picture": "nelsonestevao.jpg",
"name": "Nelson Estevão",
"role": "Champion 2020/21"
},
{
"picture": "ninja.jpg",
"name": "Nuno Silva",
"role": "Champion 2019/20"
},
{
"picture": "danieltinoco.jpg",
"name": "Daniel Tinoco",
"role": "Champion 2017/18 e 2018/19"
},
{
"picture": "ninja.jpg",
"name": "Fernando Mendes",
"role": "Organizador 2015/16 e 2016/17"
},
{
"picture": "ninja.jpg",
"name": "André Santos",
"role": "Organizador 2014/15"
},
{
"picture": "roberto.jpg",
"name": "Roberto Machado",
"role": "Co-Fundador"
},
{
"picture": "ninja.jpg",
"name": "Luís Miranda",
"role": "Co-Fundador"
},
{
"picture": "ninja.jpg",
"name": "Carlos Ferreira",
"role": "Ex-Voluntário"
},
{
"picture": "ninja.jpg",
"name": "Catarina Machado",
"role": "Ex-Voluntária"
},
{
"picture": "ninja.jpg",
"name": "Bruno Cancelinha",
"role": "Ex-Voluntário"
}
]

0 comments on commit 90889b1

Please sign in to comment.