corruption of version.c in current cvs source

[Tatsuro M. <tma...@ya...>]

Hello

In cvs source dated at 2011-11-24, version.c is corrupted.  

44: <<<<<<< version.c
45: const char gnuplot_date[] = "2011-11-12";
46: =======
47: const char gnuplot_date[] = "2011-11-24";
48: >>>>>>> 1.101

Comment out line 44, 45, 46, and 48, compile went well.
Please correct the above.

Regards

Tatsuro