Re: cvs gnome-libs error fixed ??

[Soren Harward <soren cinternet net>]

Bad CVS update.  __it happens sometimes.

--
 Soren Harward <soren@cinternet.net> | Windows DOES come with a tool
 http://www.cinternet.net/~soren/    | to restore a corrupt Registry.
 Internet Information Systems Admin  |
 Cinternet, Inc.  (513) 891-1228     | It's called FDISK.

On Wed, 30 Sep 1998, Alex g. Paoli wrote:

>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 ??? 
>
>Alex G. Paoli
>
>
>-- 
>         To unsubscribe: mail gnome-list-request@gnome.org with 
>                       "unsubscribe" as the Subject.
>