finish merging changes from v2-styling-react-select

2020-11-19 22:19:32 -05:00
parent 2c1e3f5b1f
commit 0417460bf9
4 changed files with 0 additions and 137 deletions
@@ -47,22 +47,14 @@ const parametersSlice = createSlice({
            'vco3': {
                id: 'vco3',
                waveform: 'Sine',
-<<<<<<< HEAD
-                dwgsOrModType: 0,
-=======
                dwgsOrModType: 'SynWave1',
->>>>>>> v2-styling-react-select
                waveMod: 100,
                lfoMod: 0,
            },
            'vco4': {
                id: 'vco4',
                waveform: 'Triangle',
-<<<<<<< HEAD
-                dwgsOrModType: 0,
-=======
                dwgsOrModType: 'Off',
->>>>>>> v2-styling-react-select
                waveMod: 0,
                lfoMod: 100,
            },