conflitos em intro/free.wml

[Herbert Parentes Fortes Neto (hpfn) <hpfn@ig.com.br>]

Olá,

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 ?


abraço,
-- 
Herbert Parentes Fortes Neto (hpfn)