1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
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"
|
