Removed conflict indicators.
svn path=/trunk/; revision=32727
This commit is contained in:
@ -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.
|
||||
|
||||
Reference in New Issue
Block a user