K 10 svn:author V 7 charles K 8 svn:date V 27 2016-12-02T02:24:26.794735Z K 7 svn:log V 32 Apenas resolvi um conflito local END