Conflict resolution.

2023-09-21 20:44:44 +02:00
parent 6a97893cc8 491cdda458
commit 1fa5f7c406
406 changed files with 8810 additions and 5865 deletions
--- a/src/sound/snd_opl_ymfm.cpp
+++ b/src/sound/snd_opl_ymfm.cpp
@@ -51,7 +51,7 @@ enum {

 class YMFMChipBase {
 public:
-    YMFMChipBase(uint32_t clock, fm_type type, UNUSED(uint32_t samplerate))
+    YMFMChipBase(UNUSED(uint32_t clock), fm_type type, UNUSED(uint32_t samplerate))
        : m_buf_pos(0)
        , m_flags(0)
        , m_type(type)