Quarta-feira, 15 de julho de 2015, às 18:04 -03:00, Herbert Parentes Fortes Neto (hpfn) <hpfn@ig.com.br> escreveu: > Olá, Olá Herbert, > Acabei de atualizar o CVS do webwml e tive essas mensagens: > > cvs update: Updating portuguese/intro > RCS file: /cvs/webwml/webwml/portuguese/intro/free.wml,v > retrieving revision 1.20 > retrieving revision 1.21 > Merging differences between 1.20 and 1.21 into free.wml > rcsmerge: warning: conflicts during merge > cvs update: conflicts found in portuguese/intro/free.wml > C portuguese/intro/free.wml > > Algum problema com a tradução feita ? Basta remover o arquivo free.wml e executar "cvs update" novamente. Abraço, -- Marcelo Santana (aka msantana) <marcelo@msantana.eng.br> 4096R/89C55467: 88FB 5D63 ED02 3B5D 90D6 3A3E 8698 1CC9 89C5 5467
Attachment:
pgp50SiJGGa8k.pgp
Description: OpenPGP digital signature