[Kde-i18n-eo] Konflikto

["Antonio M. Sánchez Pérez"]

Satuton,
mi korektis la konfliktojn en desktop_koffice.po, tamen kiam mi klopodas 
suprenigi g^in, subversion listigas la jenan erarmesag^on:


svn: Aborting commit: '/home/antonio/Personal/Esperantigo de 
KDE/eo/messages/koffice/desktop_koffice.po' remains in conflict
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-i18n-eo/attachments/20050907/54795c1d/attachment.html>