Re: cvs gnome-libs error fixed ??

[Raja R Harinath <harinath cs umn edu>]

"Alex g. Paoli" <ad_alexp@wgn.net> writes:
> About 2 minutes ago I complained about a error in gnome-libs. After doing
> some looking (haha about 2 seconds later) I noticed some weird print in
> gnome-animator.h listed below.. Once I removed this weird stuff it worked
> fine. Is there a reason its there ??
> 
> In gnome-animator.h
> 
> Lines 28-35 it looks like this:
> 
> --- Snip ---
> 
> <<<<<<< gnome-animator.h  
> #include <libgnomeui/gnome-pixmap.h>
> 
> #include "gnome-pixmap.h"
> 
> >>>>>>> 1.3
> =====                 
> BEGIN_GNOME_DECLS 35
> 
> -- end Snip ---
> 
> If I remove the <<<<< lines and the ==== then it works fine... What the
> hell is this stuff in the .h file ??? 

Those are CVS conflict markers.  CVS thinks that you make some editing
in that segment which same area was modified in the repository.

Please read the CVS and RCS documentation for more information.

- Hari
-- 
Raja R Harinath ------------------------------ harinath@cs.umn.edu
"When all else fails, read the instructions."      -- Cahn's Axiom
"Our policy is, when in doubt, do the right thing."   -- Roy L Ash