Merge branch 'bsongis/Issue713_more_custom_functions' of

https://github.com/opentx/opentx into bsongis/Issue713_more_custom_functions Conflicts: radio/src/audio_arm.cpp
2014-02-21 16:45:58 +01:00
parent 0345173039 5f560e8d1b
commit af4e1ce85a
1 changed files with 4 additions and 0 deletions
@@ -145,7 +145,11 @@ 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);
 }