删除了HEAD》》》》的未知代码

main/app/app_player.c

@@ -157,10 +157,6 @@ static esp_err_t play_mp3(const char *path)
 
             /* Get MP3 frame info and configure I2S clock */
             MP3GetLastFrameInfo(mp3_decoder, &frame_info);
-<<<<<<< HEAD
-=======
-
->>>>>>> d568d9bc5b5c76dc532a83c03c2ea047b8f2fabc
             /* Configure I2S clock if sample rate changed. Always reconfigure at first frame */
             if (sample_rate != frame_info.samprate ||
                     nChans != frame_info.nChans ||