Fix broken merge
authorJames Graham <james@hoppipolla.co.uk>
Thu, 16 Apr 2015 23:04:41 +0100
changeset 326789 c13dbbe381bf853c9682ed32ac4cd99c054987b8
parent 326788 5a24a3ed407d7ac715433e2ad78dc627104396da
child 326790 f8e73eb31f92d2cbbaa953e7217a2b68931d4a93
push id10169
push userdminor@mozilla.com
push dateThu, 28 Jan 2016 13:10:48 +0000
milestone40.0a1
Fix broken merge
testing/web-platform/meta/service-workers/cache-storage/window/cache-match.https.html.ini
testing/web-platform/meta/service-workers/cache-storage/worker/cache-match.https.html.ini
--- a/testing/web-platform/meta/service-workers/cache-storage/window/cache-match.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/window/cache-match.https.html.ini
@@ -1,17 +1,11 @@
 [cache-match.https.html]
   type: testharness
-<<<<<<< local
-  disabled:
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1153470
-    if (os == "linux") and (bits == 64): https://bugzilla.mozilla.org/show_bug.cgi?id=1153470
-=======
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154975
->>>>>>> other
   expected:
     if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
     if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
   [Cache.matchAll with no matching entries]
     expected:
       if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
       if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
 
--- a/testing/web-platform/meta/service-workers/cache-storage/worker/cache-match.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/worker/cache-match.https.html.ini
@@ -1,17 +1,11 @@
 [cache-match.https.html]
   type: testharness
-<<<<<<< local
-  disabled:
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1153470
-    if (os == "linux") and (bits == 64): https://bugzilla.mozilla.org/show_bug.cgi?id=1153470
-=======
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154975
->>>>>>> other
   expected:
     if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
   [Cache.matchAll with no matching entries]
     expected:
       if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [Cache.match with no matching entries]
     expected: