bad merge fix 2

pcsx2/Sio.h

@@ -30,8 +30,8 @@ struct _mcd
 	u32 transferAddr; // Transfer address
 
 	u8 FLAG;  // for PSX;
-
-	u8 port; // port
+	
+	u8 port; // port 
 	u8 slot; // and slot for this memcard
 
 	// Auto Eject
@@ -55,13 +55,13 @@ struct _mcd
 	}
 
 	// Read from memorycard to dest
-	void Read(u8 *dest, int size)
+	void Read(u8 *dest, int size) 
 	{
 		SysPlugins.McdRead(port, slot, dest, transferAddr, size);
 	}
 
 	// Write to memorycard from src
-	void Write(u8 *src, int size)
+	void Write(u8 *src, int size) 
 	{
 		SysPlugins.McdSave(port, slot, src,transferAddr, size);
 	}