getting themes from cvs --> error.

[Bertrand Guiheneuf <Bertrand Guiheneuf inria fr>]

I am not a cvs super user, so what I do may be stupid but:

to try out gtk themes I did:
cvs -z3 checkout gtk+
then 
cvs -z3 update -j themes-2 gtk+

but the gdk+/gdk/Makefile.am now is

--- cut here ---
## Process this file with automake to produce Makefile.in

gdkincludedir = $(includedir)/gdk

<<<<<<< Makefile.am
lib_LTLIBRARIES = libgdk-1.1.la
DEFS += -DG_LOG_DOMAIN=\"Gdk\"
=======
lib_LTLIBRARIES = libgdk.la
DEFS += -DG_LOG_DOMAIN=\"Gdk\"
>>>>>>> 1.18.2.1

etc ...
--- cut here --
and it does not compile.. ( complaining about those ====== )

So I guess all comes from my -j themes-2 instruction.
Could someone tell me what I do wrong?


Regards,

	Bertrand 

=======================================================================
  Bertrand GUIHENEUF           	E-Mail: bertrand.guiheneuf@inria.fr
                               	Tel.:   (33) 01 39 63 50 36
  				
                    !!  Use GNU/LINUX OS  !!
=======================================================================