Hi,
There seems to be a conflict in this web page (trunk/translations.html):
$ lynx -dump producingoss.com/translations.html
[snip...]
* [9]Polski (Polish)
Bartek G<F3>rny, Jacek Medrzycki, L/ukasz Nowak, Daniel Koc
<<<<<<< .mine =======
* [10]Deutsch (German)
Manuel Barkhau, Sebastian Menge, Reiner Pittinger
* [11]Espa<F1>ol (Spanish)
Rafael Martilotti, Alejandro Ayuso, Francisco Urbano Garc<ED>a, Jos<E9>
Manuel Puerta Pe<F1>a, Pedro Andr<E9>s Bonilla Polo, Christian L<F3>pez
Esp<ED>nola
* [12]<A5><AC> (Japanese)
<A8> <A3> (TAKAGI Masahiro), Takaoka Yoshinari
>>>>>>> .r1374
* [13]Dansk (Danish)
Mikkel Kirkgaard Nielsen
However, my working copy doesn't show anything strange.
Ari Constancio
_______________________________________________
Producingoss-translators mailing list
Producingoss-translators@red-bean.com
http://www.red-bean.com/mailman/listinfo/producingoss-translators
