Skip to content

Commit b392771

Browse files
merging all conflicts
2 parents 6a3bb06 + e0a0ec3 commit b392771

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

content/community/conferences.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ December 6, 2019 in Berlin, Germany
2222

2323
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/reactdayberlin)
2424

25+
### React Barcamp Cologne 2020 {#react-barcamp-cologne-2020}
26+
February 1-2, 2020 in Cologne, Germany
27+
28+
[Website](https://react-barcamp.de/) - [Twitter](https://twitter.com/ReactBarcamp) - [Facebook](https://www.facebook.com/reactbarcamp)
29+
2530
### ReactConf AU 2020 {#reactconfau}
2631
February 27 & 28, 2020 in Sydney, Australia
2732

content/community/meetups.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
6161
* [Paris](https://www.meetup.com/ReactJS-Paris/)
6262

6363
## Germany {#germany}
64+
* [Cologne](https://www.meetup.com/React-Cologne/)
6465
* [Düsseldorf](https://www.meetup.com/de-DE/ReactJS-Meetup-Dusseldorf/)
6566
* [Hamburg](https://www.meetup.com/Hamburg-React-js-Meetup/)
6667
* [Karlsruhe](https://www.meetup.com/react_ka/)

content/docs/hooks-reference.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,11 @@ function FancyInput(props, ref) {
450450
FancyInput = forwardRef(FancyInput);
451451
```
452452

453+
<<<<<<< HEAD
453454
W tym przykładzie komponent rodzica, który renderuje `<FancyInput ref={fancyInputRef} />` będzie w stanie wywołać `fancyInputRef.current.focus()`.
455+
=======
456+
In this example, a parent component that renders `<FancyInput ref={inputRef} />` would be able to call `inputRef.current.focus()`.
457+
>>>>>>> e0a0ec3dad47804d0b41d4a7bb81841638dc79dd
454458
455459
### `useLayoutEffect` {#uselayouteffect}
456460

0 commit comments

Comments
 (0)