Closed
requested to merge github/fork/guilhermebferreira/resolving_merge_conflicts__pt_br into master
Created by: guilhermebferreira
I did translate the content of the file resolving_merge_conflicts.md into Brazilian Portuguese
Created by: guilhermebferreira
I did translate the content of the file resolving_merge_conflicts.md into Brazilian Portuguese