summaryrefslogtreecommitdiffstats
path: root/src/devices/machine/x2201.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/x2201.cpp')
-rw-r--r--src/devices/machine/x2201.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/devices/machine/x2201.cpp b/src/devices/machine/x2201.cpp
index e05df4dd5da..c47b1cd52aa 100644
--- a/src/devices/machine/x2201.cpp
+++ b/src/devices/machine/x2201.cpp
@@ -25,9 +25,15 @@
#include "emu.h"
#include "machine/x2201.h"
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> upstream/master
+=======
+
+#include "fileio.h"
+
+>>>>>>> parent of ea6d1ae3f4c (Revert "Remove fileio.h from emu.h")
#include <algorithm>