Merge problem :(

This commit is contained in:
Bertrand Songis
2014-02-21 16:51:51 +01:00
parent af4e1ce85a
commit d02912577b
-4
View File
@@ -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);
}