From 8fa1adcc807897203d8afa95825c2cde0a188d84 Mon Sep 17 00:00:00 2001
From: Edoardo Prezioso <edward.san.dev@gmail.com>
Date: Wed, 3 Jun 2020 16:58:11 +0200
Subject: [PATCH] Solve merge conflicts.

---
 src/posix/cocoa/i_system.mm | 17 -----------------
 src/posix/i_system.h        | 16 ----------------
 src/posix/sdl/i_system.cpp  | 24 ------------------------
 3 files changed, 57 deletions(-)

diff --git a/src/posix/cocoa/i_system.mm b/src/posix/cocoa/i_system.mm
index 507ab02dfdb..87ab877f7a9 100644
--- a/src/posix/cocoa/i_system.mm
+++ b/src/posix/cocoa/i_system.mm
@@ -38,23 +38,6 @@
 #include "i_system.h"
 #include "st_console.h"
 #include "v_text.h"
-<<<<<<< HEAD
-#include "x86.h"
-#include "cmdlib.h"
-
-void I_Tactile(int /*on*/, int /*off*/, int /*total*/)
-{
-}
-
-
-ticcmd_t* I_BaseTiccmd()
-{
-	static ticcmd_t emptycmd;
-	return &emptycmd;
-}
-
-=======
->>>>>>> master
 
 
 double PerfToSec, PerfToMillisec;
diff --git a/src/posix/i_system.h b/src/posix/i_system.h
index 92fa25f3e4e..d272c8e6d12 100644
--- a/src/posix/i_system.h
+++ b/src/posix/i_system.h
@@ -69,22 +69,6 @@ void I_StartFrame (void);
 // Can call D_PostEvent.
 void I_StartTic (void);
 
-// Asynchronous interrupt functions should maintain private queues
-// that are read by the synchronous functions
-// to be converted into events.
-
-<<<<<<< HEAD
-void I_Tactile (int on, int off, int total);
-
-void I_DebugPrint (const char *cp);
-=======
-// Either returns a null ticcmd,
-// or calls a loadable driver to build it.
-// This ticcmd will then be modified by the gameloop
-// for normal input.
-ticcmd_t *I_BaseTiccmd (void);
->>>>>>> master
-
 // Print a console string
 void I_PrintStr (const char *str);
 
diff --git a/src/posix/sdl/i_system.cpp b/src/posix/sdl/i_system.cpp
index 6f13c12c5c8..2b588404848 100644
--- a/src/posix/sdl/i_system.cpp
+++ b/src/posix/sdl/i_system.cpp
@@ -30,22 +30,6 @@
 #include "version.h"
 #include "x86.h"
 
-<<<<<<< HEAD
-#include "d_main.h"
-#include "network/net.h"
-#include "g_game.h"
-#include "c_dispatch.h"
-
-#include "gameconfigfile.h"
-
-extern "C"
-{
-	double		SecondsPerCycle = 1e-8;
-	double		CyclesPerSecond = 1e8;
-}
-=======
->>>>>>> master
-
 #ifndef NO_GTK
 bool I_GtkAvailable ();
 int I_PickIWad_Gtk (WadStuff *wads, int numwads, bool showwin, int defaultiwad);
@@ -56,15 +40,7 @@ int I_PickIWad_Cocoa (WadStuff *wads, int numwads, bool showwin, int defaultiwad
 
 double PerfToSec, PerfToMillisec;
 
-<<<<<<< HEAD
-void I_Tactile (int /*on*/, int /*off*/, int /*total*/)
-{
-}
-
-void I_BeginRead(void)
-=======
 void I_SetIWADInfo()
->>>>>>> master
 {
 }