Skip to content

Commit 1315f6a

Browse files
authored
Fix merge error from previous commit (w3c#9947)
1 parent 6b3259f commit 1315f6a

1 file changed

Lines changed: 0 additions & 7 deletions

File tree

css-view-transitions-1/Overview.bs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -956,17 +956,10 @@ urlPrefix: https://wicg.github.io/navigation-api/; type: interface;
956956

957957
1. Let |document| be [=this's=] [=relevant global object's=] [=associated document=].
958958

959-
<<<<<<< HEAD
960959
1. If |document|'s [=Document/visibility state=] is "<code>hidden</code>",
961960
then [=skip the view transition|skip=] |transition| with an "{{InvalidStateError}}" {{DOMException}},
962961
and return.
963962

964-
1. If |document|'s [=auto-skip view transitions=] is true,
965-
then [=skip the view transition|skip=] |transition| with an "{{InvalidStateError}}" {{DOMException}},
966-
and return.
967-
968-
=======
969-
>>>>>>> 2b700bdce (Move all cross-doc references to L2)
970963
1. If |document|'s [=active view transition=] is not null,
971964
then [=skip the view transition|skip that view transition=]
972965
with an "{{AbortError}}" {{DOMException}} in [=this's=] [=relevant Realm=].

0 commit comments

Comments
 (0)