Skip to content

Commit fc981f4

Browse files
[문서] 01-popup-windows 번역 충돌 해결
1 parent adb9689 commit fc981f4

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

3-frames-and-windows/01-popup-windows/article.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,7 @@ There's also `window.onscroll` event.
219219

220220
Theoretically, there are `window.focus()` and `window.blur()` methods to focus/unfocus on a window. And there are also `focus/blur` events that allow to catch the moment when the visitor focuses on a window and switches elsewhere.
221221

222-
<<<<<<< HEAD
223-
Although, in practice they are severely limited, because in the past evil pages abused them.
224-
=======
225222
Although, in practice they are severely limited, because in the past evil pages abused them.
226-
>>>>>>> upstream/master
227223

228224
For instance, look at this code:
229225

0 commit comments

Comments
 (0)