From 30eb5e949c237486937cdc34f03a19e7e6cf6890 Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Mon, 16 Nov 2020 16:50:15 +0100
Subject: [PATCH] fix merge conflict

---
 .../material-ui/src/Autocomplete/Autocomplete.test.js     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/material-ui/src/Autocomplete/Autocomplete.test.js b/packages/material-ui/src/Autocomplete/Autocomplete.test.js
index f082d3b8a968ed..5cbe6be1c5eae3 100644
--- 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;