Fix some merge wobbles in headers

2020-04-03 22:20:14 -07:00
parent 9f193f123e
commit a0823420c3
2 changed files with 0 additions and 4 deletions
@@ -220,8 +220,6 @@ TFB_SetInputVectors (volatile int menu[], int num_menu_, volatile int flight[],
 	num_flight = num_flight_;
 }

-#ifdef HAVE_JOYSTICK
-
 static void
 initJoystick (void)
 {
@@ -21,8 +21,6 @@
 #ifndef UQM_CNCTDLG_H_
 #define UQM_CNCTDLG_H_

-#ifdef NETPLAY
-
 #include "libs/compiler.h"

 #if defined(__cplusplus)