merges main into feat_InterpolationExp

vackva · Jun 19, 2024 · 042290f · 042290f
1 parent 8d4c18f
commit 042290f
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/source/PluginParameters.h b/source/PluginParameters.h
@@ -27,12 +27,9 @@ class PluginParameters {
             ZLFO_PHASE_ID = {"param_zlfo_phase", 1},
             ZLFO_OFFSET_ID = {"param_zlfo_offset", 1},
             PRESETS_ID = {"param_presets", 1},
-<<<<<<< HEAD
+            DOPPLER_ID = {"param_doppler", 1},
             SOFA_CHOICE_ID = {"param_sofa_choices", 1},
             INTERP_ID = {"param_nearest_neighbour_interp", 1};
-=======
-            DOPPLER_ID = {"param_doppler", 1};
->>>>>>> main
 
 
 
@@ -57,14 +54,10 @@ class PluginParameters {
             ZLFO_DEPTH_NAME = "Z LFO Depth",
             ZLFO_PHASE_NAME = "Z LFO Phase",
             ZLFO_OFFSET_NAME = "Z LFO Offset",
-<<<<<<< HEAD
-            PRESETS_NAME = "Presets",
+            PRESETS_NAME = "Presets", 
+            DOPPLER_NAME = "Doppler Effect Enabled",
             SOFA_CHOICE_NAME = "Sofa Choices",
             INTERP_NAME = "Nearest Neighbour Interpolation";
-=======
-            PRESETS_NAME = "Presets", 
-            DOPPLER_NAME = "Doppler Effect Enabled";
->>>>>>> main