fixed rebase errors

flutter · Jun 8, 2023 · 2cc91ae · 2cc91ae
1 parent 83879f6
commit 2cc91ae
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java b/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
@@ -41,13 +41,10 @@ public class FlutterLoader {
       "io.flutter.embedding.android.OldGenHeapSize";
   private static final String ENABLE_IMPELLER_META_DATA_KEY =
       "io.flutter.embedding.android.EnableImpeller";
-<<<<<<< HEAD
-=======
   private static final String IMPELLER_BACKEND_META_DATA_KEY =
       "io.flutter.embedding.android.ImpellerBackend";
   private static final String ENABLE_VULKAN_VALIDATION_META_DATA_KEY =
       "io.flutter.embedding.android.EnableVulkanValidation";
->>>>>>> 2e93fc1cf8 ([Impeller] made a switch for turning on validation layers)
 
   /**
    * Set whether leave or clean up the VM after the last shell shuts down. It can be set from app's