Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00
Code Issues Releases Wiki Activity

Fix unresilved conflict

Browse Source
This commit is contained in:
Adam Novak 2022-05-09 21:02:44 -04:00
parent 7b4782ce5a
commit 3be9aa1b55
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/build.gradle
View File

@ -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 {