diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp index 678d173e0..b1229f1cc 100644 --- a/radio/src/audio_arm.cpp +++ b/radio/src/audio_arm.cpp @@ -145,11 +145,7 @@ char * getAudioPath(char * path) char * getSystemAudioPath(char * path) { char * str = getAudioPath(path); -<<<<<<< HEAD strcpy(str, SYSTEM_SUBDIR "/"); -======= - strcpy(path, SYSTEM_SUBDIR "/"); ->>>>>>> 5f560e8d1b2815267f118be59c9269ed42357d66 return str + sizeof(SYSTEM_SUBDIR); }