From df65ec21036d57ae94cf6f7ec988157f3fed8652 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Thu, 21 Sep 2023 20:46:11 +0200
Subject: [PATCH] Resolve conflict.

---
 src/include/86box/snd_opl.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/include/86box/snd_opl.h b/src/include/86box/snd_opl.h
index eacd09e2c..0d89589c4 100644
--- a/src/include/86box/snd_opl.h
+++ b/src/include/86box/snd_opl.h
@@ -38,11 +38,7 @@ typedef struct fm_drv_t {
     void     (*reset_buffer)(void *priv);
     void     (*set_do_cycles)(void *priv, int8_t do_cycles);
     void      *priv;
-<<<<<<< HEAD
-    void      (*generate)(void *priv, int32_t *data, uint32_t num_samples); /* daughterboard only. */
-=======
     void     (*generate)(void *priv, int32_t *data, uint32_t num_samples); /* daughterboard only. */
->>>>>>> 2b4f7733811f8b79197d2b44a0ff7ba2553d68c9
 } fm_drv_t;
 
 extern uint8_t fm_driver_get(int chip_id, fm_drv_t *drv);