error in CVS

[<pl...@pi...>]

Hi,

just updated from cvs and it fails to compile version.h

looks like a patching error:


const char gnuplot_version[] = "4.7";
const char gnuplot_patchlevel[] = "0";
<<<<<<< version.c
const char gnuplot_date[] = "2012-02-08 ";
const char gnuplot_copyright[] = "Copyright (C) 1986-1993, 1998, 2004, 
2007-2011";
=======
const char gnuplot_date[] = "2012-03-02 ";
const char gnuplot_copyright[] = "Copyright (C) 1986-1993, 1998, 2004, 
2007-2012";
 >>>>>>> 1.104