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"/>

That doesn't look right to me. 
Is it just in my file?

WillyB

_______________________________________________
Flightgear-devel mailing list
[EMAIL PROTECTED]
http://mail.flightgear.org/mailman/listinfo/flightgear-devel

Reply via email to