summaryrefslogtreecommitdiff
path: root/waterfox/waterfox-fix-testing-file.patch
diff options
context:
space:
mode:
Diffstat (limited to 'waterfox/waterfox-fix-testing-file.patch')
-rw-r--r--waterfox/waterfox-fix-testing-file.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/waterfox/waterfox-fix-testing-file.patch b/waterfox/waterfox-fix-testing-file.patch
new file mode 100644
index 0000000..69f9e48
--- /dev/null
+++ b/waterfox/waterfox-fix-testing-file.patch
@@ -0,0 +1,42 @@
+--- ./testing/web-platform/meta/MANIFEST.json.fix-testing-file 2019-03-14 09:55:07.880590923 -0300
++++ ./testing/web-platform/meta/MANIFEST.json 2019-03-14 09:58:05.190243977 -0300
+@@ -332313,15 +332313,15 @@
+ {}
+ ]
+ ],
+-<<<<<<< HEAD
+ "cssom-view/scrollIntoView-empty-args.html": [
+ [
+ "/cssom-view/scrollIntoView-empty-args.html",
+-=======
++ {}
++ ]
++ ],
+ "cssom-view/offsetTopLeftInScrollableParent.html": [
+ [
+ "/cssom-view/offsetTopLeftInScrollableParent.html",
+->>>>>>> cdaa87569629... Bug 1389274 - Correct the behavior of Element.scrollIntoView to match the draft spec and pass web platform tests; r=annevk,bkelly
+ {}
+ ]
+ ],
+@@ -569554,12 +569554,10 @@
+ "b2261ec702116c211ab5ac6fbb53698dfe60a7be",
+ "testharness"
+ ],
+-<<<<<<< HEAD
+ "cssom-view/scrollIntoView-empty-args.html": [
+ "c1bd398158cc935c8c69cb0291c2ef0e0faa6bad",
+ "testharness"
+ ],
+-=======
+ "cssom-view/offsetTopLeftInScrollableParent.html": [
+ "79b4a278f0e35646cfdffeebf8f0523e2772bc9b",
+ "testharness"
+@@ -569580,7 +569578,6 @@
+ "987051cdbad355cbb1bbb8ea1030a3b17e533f09",
+ "manual"
+ ],
+->>>>>>> cdaa87569629... Bug 1389274 - Correct the behavior of Element.scrollIntoView to match the draft spec and pass web platform tests; r=annevk,bkelly
+ "cssom-view/scrollIntoView-shadow.html": [
+ "3c4a18992105fd7bf19cbf29f0b6d80cb12ca98c",
+ "testharness"
bgstack15