Compare commits

..

No commits in common. "e66ea28b7fa0636e6fec56237f27c21ce9ed7e28" and "54980669c2f10b0d7b73df6d60fcd60c4560095e" have entirely different histories.

2 changed files with 1 additions and 4 deletions

View file

@ -1,8 +1,6 @@
{
"events": [
{
<<<<<<< HEAD
=======
"title": "Open - Desafio dos Navegadores",
"date": "14/02/2026",
"location": "Porto, Trofa",
@ -10,7 +8,6 @@
"signups": false
},
{
>>>>>>> 54980669c2f10b0d7b73df6d60fcd60c4560095e
"title": "Open",
"date": "09/05/2026",
"location": "Malveira, Mafra",

View file

@ -1,5 +1,5 @@
{
"active": false,
"active": true,
"header": "Open - Desafio dos Navegadores",
"paragraph": "Vê em direto no YouTube o Open - Desafio dos Navegadores, dia 14/02 às 11h00.",
"hasLink": true,