Fixed merge conflicts

.gitignore

@@ -17,3 +17,4 @@ kickstarts/*.rom
 *.000
 *.001
 *.opendb
+*.npa01

src/gfxboard.cpp

@@ -12,11 +12,7 @@
 
 #include "options.h"
 #include "uae.h"
-<<<<<<< HEAD
 #include "include/memory.h"
-=======
-#include "memory.h"
->>>>>>> origin/master
 #include "debug.h"
 #include "custom.h"
 #include "newcpu.h"
@@ -33,8 +29,5 @@ bool gfxboard_is_z3 (int type)
 	if (type == GFXBOARD_UAE_Z3)
 		return true;
 	return false;
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> origin/master
+

src/include/gfxboard.h

@@ -2,8 +2,5 @@
 extern bool gfxboard_is_z3 (int);
 
 #define GFXBOARD_UAE_Z2 0
-<<<<<<< HEAD
 #define GFXBOARD_UAE_Z3 1
-=======
-#define GFXBOARD_UAE_Z3 1
->>>>>>> origin/master
+

src/include/scsi.h

@@ -1,6 +1 @@
-
-<<<<<<< HEAD
 #define SCSI_DATA_BUFFER_SIZE (512 * 512)
-=======
-#define SCSI_DATA_BUFFER_SIZE (512 * 512)
->>>>>>> origin/master

src/newcpu_common.cpp

@@ -657,7 +657,3 @@ void m68k_mull (uae_u32 opcode, uae_u32 src, uae_u16 extra)
   }
 #endif
 }
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/master