.

8 years ago · ff4b7d322f
parent 037a3260ce
commit ff4b7d322f
1 changed files with 0 additions and 4 deletions
--- a/connectfourLearn.php
+++ b/connectfourLearn.php
@ -72,11 +72,7 @@ function play($map,$colToPlay,$me,$opponent,$gameid,$player_index){
     map='".hash_map($map,$me,$opponent)."',
     play_at='".$colToPlay."';");
     
-<<<<<<< HEAD
-    echo '{"play":'.$colToPlay.'}';
-=======
    echo '{"play":'.$colToPlay.',"trace":"'.$trace.'"}';
->>>>>>> 6274fd69c6243df749a1975580ece25a3f80582f
    die;
 }