On Tuesday 08 July 2003 22:54, Melchior FRANZ wrote: > * WillyB -- Wednesday 09 July 2003 03:23: > > Anyone notice this in the joysticks.xml? > > > > <!-- Microsoft devices --> > > <<<<<<< joysticks.xml > > <js-named include="Input/Joysticks/Microsoft/sidewinder-joystick.xml"/> > > ======= > > <js-named include="Input/Joysticks/Microsoft/sidewinder.xml"/> > > > > >>>>>>> 1.18 > > > > <js-named > > include="Input/Joysticks/Microsoft/sidewinder-force-feed.xml"/> > > This is how cvs marks merging conflicts. Just remove the three lines > from <<<... to ===... and the single line starting with >>>.... > You can as well delete the file and "cvs up" it again. You always > have to fix things like that, if "cvs up" reports a conflict. It > outputs the filename with a "C " in front then, e.g.: > > P keyboard.xml > C joysticks.xml > U urks.txt > ... > > m. >
I didn't realize that.. thanks :) WillyB > _______________________________________________ > Flightgear-devel mailing list > [EMAIL PROTECTED] > http://mail.flightgear.org/mailman/listinfo/flightgear-devel _______________________________________________ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
