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

--HG--
extra : amend_source : 87cda0320286a155a486eb4272018cfd76a11c86

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

@@ -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()