mg

README.md

 ## YGOPro 2Pick test
 A ygopro server for testing 2pick mode
+

gframe/single_duel.cpp

@@ -741,12 +741,8 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
 			//modded
 			case 10:
 			case 11:
-<<<<<<< HEAD
-			case 12: {
-=======
 			case 12:
 			case 13: {
->>>>>>> 14a10e9739978823dada7a651464807daa69d5a3
 				NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
 				NetServer::SendBufferToPlayer(players[1], STOC_GAME_MSG, offset, pbuf - offset);
 				for(auto oit = observers.begin(); oit != observers.end(); ++oit)

gframe/tag_duel.cpp

@@ -667,12 +667,8 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
 			}
 			//modded
 			case 11:
-<<<<<<< HEAD
-			case 12: {
-=======
 			case 12:
 			case 13: {
->>>>>>> 14a10e9739978823dada7a651464807daa69d5a3
 				for(int i = 0; i < 4; ++i)
 					NetServer::SendBufferToPlayer(players[i], STOC_GAME_MSG, offset, pbuf - offset);
 				for(auto oit = observers.begin(); oit != observers.end(); ++oit)