Skip to content
This repository has been archived by the owner on Jun 12, 2023. It is now read-only.

Commit

Permalink
Minimizar conflitos em merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
@idgserpro
idgserpro committed Oct 24, 2016
1 parent fc3e2ba commit ebe8994
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitattributes
View file
@@ -0,0 +1 @@
CHANGES.rst merge=union

0 comments on commit ebe8994

Please sign in to comment.