Skip to content
Open
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ <h2>Aqui que vão rolar os conflitos</h2>
Alterando essa linha - Felipe Ozias
Quero acrescentar mais coisas.
Eu estive aqui.
Eu também.
=======
Alteração feita pelo Fábio César.
>>>>>>> 6d37cc1 (chore: add line of text to index.html)
Expand Down