Fixed Pt-Br
Fixed Pt-Br

Fixed resolve conflict results and indent error in Pt-Br
javatlacati/codecombat,jeremiahyan/codecombat,codecombat/codecombat,javatlacati/codecombat,codecombat/codecombat,codecombat/codecombat,codecombat/codecombat,javatlacati/codecombat,jeremiahyan/codecombat,jeremiahyan/codecombat,jeremiahyan/codecombat,javatlacati/codecombat,javatlacati/codecombat,codecombat/codecombat