Skip to content

Commit

Permalink
Resolvendo conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@orionwinter
orionwinter committed Oct 18, 2014
2 parents 7b7cb22 + 244ba1b commit 5843e78
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Este reposit�rio cont�m os c�digos referente ao Lab1 da disciplina Sistemas de Informa��o 1.
Aqui que vai dar uma treta muito grande!
Aqui que vai dar o conflito! (J� resolvido agora!)

0 comments on commit 5843e78

Please sign in to comment.