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
@@ -26,13 +26,6 @@ const Slider = (props) => {

 const SelectList = (props) => {
    return (
-<<<<<<< HEAD
-        <select
-            value={props.value}
-            onChange={(e) => props.onChange(e.target.value)}>
-            {options}
-        </select>
-=======
        <Select
            value={{ value: props.value }}
            options={props.list}
@@ -40,7 +33,6 @@ const SelectList = (props) => {
            onChange={(e) => props.onChange(e.value)}
            styles={SelectStyle}
        />
->>>>>>> v2-styling-react-select
    );
 };