When cvs update produces conflicts, remove them and try again. This always
authorPeter Eisentraut <peter_e@gmx.net>
Sat, 11 Apr 2009 11:36:02 +0000 (11:36 +0000)
committerPeter Eisentraut <peter_e@gmx.net>
Sat, 11 Apr 2009 11:36:02 +0000 (11:36 +0000)
commitecded3a7a3365533b47da4e4dbfb1cedc50d92cf
tree324d1814bbcdf4472b5a960a35ffc19070a79208
parent8934dfc0d09879883c06feb21cca9fdb1d9d0cd9
When cvs update produces conflicts, remove them and try again.  This always
happens when adding new PO files to the PostgreSQL CVS for the first time.
wwwtools/update-nls-www