Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-03 07:01:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1343678 - Followup to fix rebase error. r=snorp

Browse Source 
--HG--
extra : amend_source : 87cda0320286a155a486eb4272018cfd76a11c86
This commit is contained in:
Cosmin Sabou 2019-08-29 22:18:07 +03:00
parent ef037077c5
commit 2d00478eeb
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt
View File

@ -59,11 +59,8 @@ open class BaseSessionTest(noErrorCollector: Boolean = false) {
const val COLORS_HTML_PATH = "/assets/www/colors.html"
const val FIXED_BOTTOM = "/assets/www/fixedbottom.html"
const val STORAGE_TITLE_HTML_PATH = "/assets/www/reflect_local_storage_into_title.html"
<<<<<<< HEAD
const val HUNG_SCRIPT = "/assets/www/hungScript.html"
=======
const val PUSH_HTML_PATH = "/assets/www/push/push.html"
>>>>>>> Bug 1343678 - Add WebPush support to GeckoView r?#geckoview-reviewers
}
@get:Rule val sessionRule = GeckoSessionTestRule()