Skip to content

resolvendo conflito 🔎 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabrielbringel wants to merge 2 commits into
base: ricardo
Choose a base branch
from
Open

resolvendo conflito 🔎 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84eaa9e
resposta de Bringel
gabrielbringel Apr 10, 2026
285956b
Merge branch 'ricardo' into merge-gabrielBringel
gabrielbringel Apr 10, 2026
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
4 changes: 2 additions & 2 deletions desafio-merge/grupo-3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Desafio Merge — Grupo 3
# Desafio Merge — Grupo 3

## Pergunta: Qual a habilidade mais importante para um dev além de programar?

Expand All @@ -11,4 +11,4 @@ Resolver problemas e ter dor de cabeça no cortex pré frontal
Python
HTML
CSS
</ul>
</ul>
8 changes: 8 additions & 0 deletions profiles/exemplo.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Maria Exemplo

- **Curso:** Ciência da Computação
- **Período:** 4º
- **GitHub:** [@mariaexemplo](https://github.com/mariaexemplo)
- **Um fato curioso sobre você:** Coleciono adesivos de tecnologia
- **Tecnologia favorita:** JavaScript
- **Objetivo na área de tech:** Contribuir para projetos open source