fix merge conflict

mui · Nov 16, 2020 · 30eb5e9 · 30eb5e9
1 parent 6cf4eb5
commit 30eb5e9
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/packages/material-ui/src/Autocomplete/Autocomplete.test.js b/packages/material-ui/src/Autocomplete/Autocomplete.test.js
@@ -591,13 +591,6 @@ describe('<Autocomplete />', () => {
               handleSubmit();
             }
           }}
-<<<<<<< HEAD
-          onChange={handleChange}
-          openOnFocus
-          options={['one', 'two', 'three']}
-          renderInput={(props2) => <TextField {...props2} autoFocus />}
-        />,
-=======
         >
           <Autocomplete
             disabledItemsFocusable
@@ -608,7 +601,6 @@ describe('<Autocomplete />', () => {
             renderInput={(props2) => <TextField {...props2} autoFocus />}
           />
         </div>,
->>>>>>> [Autocomplete] Add ability to override key down events handlers
       );
 
       let options;