From 6fdb8bdf730e110818a4b4cfbca8c1a245aff7df Mon Sep 17 00:00:00 2001
From: Adam Novak <interfect@gmail.com>
Date: Mon, 9 May 2022 21:02:44 -0400
Subject: [PATCH] Fix unresilved conflict

---
 app/build.gradle | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0047253738..0b1404b471 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -214,24 +214,6 @@ android {
         androidTest {
             resources.srcDirs += ['src/androidTest/resources']
         }
-<<<<<<< HEAD
-=======
-        beta {
-            java.srcDirs = ['src/migration/java']
-            manifest.srcFile "src/migration/AndroidManifest.xml"
-        }
-        release {
-            java.srcDirs = ['src/migration/java']
-            manifest.srcFile "src/migration/AndroidManifest.xml"
-        }
-        forkDebug {
-            java.srcDirs = ['src/geckoNightly/java']
-        }
-        forkRelease {
-            // No migration needed for fork
-            java.srcDirs = ['src/geckoRelease/java']
-        }
->>>>>>> b26ac1b01... Do all of Iceraven in one commit
     }
 
     splits {