Re: [Fink-devel] CVS conflict detection

2004-01-11 Thread Max Horn
Am 11.01.2004 um 00:21 schrieb Ben Hines: Fink should be able to realize what this is: WARNING: Unable to parse the line "<<< libbonobo2.info" in "/sw/fink/dists/unstable/main/finkinfo/gnome/libbonobo2.info". WARNING: Unable to parse the line "===" in "/sw/fink/dists/unstable/main/finki

[Fink-devel] CVS conflict detection

2004-01-10 Thread Ben Hines
Fink should be able to realize what this is: WARNING: Unable to parse the line "<<< libbonobo2.info" in "/sw/fink/dists/unstable/main/finkinfo/gnome/libbonobo2.info". WARNING: Unable to parse the line "===" in "/sw/fink/dists/unstable/main/finkinfo/gnome/libbonobo2.info". WARNING: Unable