remove merge conflicts

elastic · Mar 14, 2022 · 412d4f6 · 412d4f6
1 parent 23c52cd
commit 412d4f6
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/x-pack/test/functional/apps/maps/index.js b/x-pack/test/functional/apps/maps/index.js
@@ -95,11 +95,8 @@ export default function ({ loadTestFile, getService }) {
       loadTestFile(require.resolve('./layer_errors'));
       loadTestFile(require.resolve('./visualize_create_menu'));
       loadTestFile(require.resolve('./discover'));
-<<<<<<< HEAD
-      loadTestFile(require.resolve('./lens'));
-=======
       loadTestFile(require.resolve('./geofile_wizard_auto_open'));
->>>>>>> f071726b9e7bd20ccb9fc0e1d36de59d8d92b4fd
+      loadTestFile(require.resolve('./lens'));
     });
   });
 }