Unresolved CVS conflict in gucharmap

[Danilo Segan <dsegan gmx net>]

Hi Guntupalli,

You missed to resolve the CVS conflicts that occured when you commited 
the new "hi" translation.

Conflicts have happended in the configure.ac file (thus making the 
entire gucharmap unbuildable) and the root ChangeLog file. Thanks to 
MCArcan on #i18n for pointing this out.

I've fixed these, but please be careful next time you perform a commit, 
in order to maintain the Gnome policy "buildable from CVS at any time".


Actually, the problem was that you fairly old (2003-06-12) commit 
didn't go through, so you probably missed then that the merge was done, 
and never resolved it. So, it just stayed in until you tried another 
commit.


Please be more careful next time, and watch the diagnostic messages 
that CVS outputs.


Cheers,
Danilo