Removed conflict indicators.

svn path=/trunk/; revision=32727
This commit is contained in:
Josep Puigdemont i Casamajó
2006-09-03 17:22:23 +00:00
parent 3613e6b205
commit 8ddfa79e4f

View File

@ -1378,7 +1378,6 @@
* nb.po: Updated Norwegian bokmål translation.
* no.po: Same.
>>>>>>> 1.2514
2006-02-17 Vincent van Adrighem <adrighem@gnome.org>
* nl.po: Translation updated by Tino Meinen.