Bug 1424300 P3.1 Add a mochitest verifying we can recover if the script cache is deleted: Fix merge conflict. r=bustage-fix a=bustage-fix
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 18 Dec 2017 15:30:02 +0200
changeset 445360 44c9c219f7a5849e88433dc1d627f5ddb77c89e3
parent 445359 5efea9dc422db6ad123c629d63bce0ba444e966a
child 445361 99e8736d4a20fa1b937346863a95bfac9531e73c
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix, bustage-fix
bugs1424300
milestone58.0
Bug 1424300 P3.1 Add a mochitest verifying we can recover if the script cache is deleted: Fix merge conflict. r=bustage-fix a=bustage-fix
dom/workers/test/serviceworkers/mochitest.ini
--- a/dom/workers/test/serviceworkers/mochitest.ini
+++ b/dom/workers/test/serviceworkers/mochitest.ini
@@ -217,21 +217,17 @@ support-files =
   async_waituntil_worker.js
   lazy_worker.js
   nofetch_handler_worker.js
   service_worker.js
   service_worker_client.html
   utils.js
   bug1290951_worker_main.sjs
   bug1290951_worker_imported.sjs
-<<<<<<< local
-=======
-  sw_storage_not_allow.js
   update_worker.sjs
->>>>>>> graft
 
 [test_bug1151916.html]
 [test_bug1240436.html]
 [test_bug1408734.html]
 [test_claim.html]
 [test_claim_oninstall.html]
 [test_controller.html]
 [test_cookie_fetch.html]