Skip to content

Commit c097152

Browse files
committed
resolve conflict
1 parent 5168e4a commit c097152

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

content/docs/accessibility.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,7 @@ class OuterClickExample extends React.Component {
298298

299299
<img src="../images/docs/outerclick-with-keyboard.gif" alt="A toggle button opening a popover list implemented with the click outside pattern and operated with the keyboard showing the popover not being closed on blur and it obscuring other screen elements." />
300300

301-
<<<<<<< HEAD
302301
Chúng ta cũng có thể đạt được chức năng tương tự bằng cách sử dụng những event handlers thích hợp, như `onBlur``onFocus`:
303-
=======
304-
The same functionality can be achieved by using appropriate event handlers instead, such as `onBlur` and `onFocus`:
305-
>>>>>>> c93286c071bca17ecba91cd130908fe2e33a4766
306302

307303
```javascript{19-29,31-34,37-38,40-41}
308304
class BlurExample extends React.Component {

0 commit comments

Comments
 (0)