Whoops.

spotify · Feb 8, 2022 · 9ba99b9 · 9ba99b9
1 parent 176c3d1
commit 9ba99b9
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/pedalboard/plugin_templates/ForceMono.h b/pedalboard/plugin_templates/ForceMono.h
@@ -21,11 +21,8 @@
 #include "../Plugin.h"
 #include <mutex>
 
-<<<<<<< HEAD
-=======
 #include "../plugins/AddLatency.h"
 
->>>>>>> origin/master
 namespace Pedalboard {
 
 /**