From 1a892131b8b68cca136005029a650a66e9cdf790 Mon Sep 17 00:00:00 2001 From: Wojtek Szafraniec Date: Sat, 1 Feb 2020 01:58:25 +0100 Subject: [PATCH 1/3] Update conferences list (#2707) * Update conferences list Add React Native Eu 2020 conference * Update conferences.md * Update conferences.md Co-authored-by: Alexey Pyltsyn --- content/community/conferences.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/content/community/conferences.md b/content/community/conferences.md index 18679c1d1..74fff851b 100644 --- a/content/community/conferences.md +++ b/content/community/conferences.md @@ -87,6 +87,11 @@ September 1, 2020 in Melbourne, Australia [Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/ComponentsConf) - [Facebook](https://www.facebook.com/ComponentsConf/) - [LinkedIn](https://www.linkedin.com/company/componentsconf/) - [YouTube](https://www.youtube.com/ComponentsConf) +### React Native EU 2020 {#react-native-eu-2020} +September 5-6, 2020 in Wrocław, Poland + +[Website](https://www.react-native.eu/) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu/) - [YouTube](https://www.youtube.com/watch?v=m0GfmlGFh3E&list=PLZ3MwD-soTTHy9_88QPLF8DEJkvoB5Tl-) - [Instagram](https://www.instagram.com/reactnative_eu/) + ### React India 2020 {#react-india-2020} November 6, 2020 in Mumbai, India From 12eaa7a95df236dc19f9d36893519f2cc2500828 Mon Sep 17 00:00:00 2001 From: Juan Moises Torrijos Date: Fri, 31 Jan 2020 20:00:28 -0500 Subject: [PATCH 2/3] Add Panama to React meetup list. (#2708) * Add Panama to React meetup list. * Update meetups.md Co-authored-by: Alexey Pyltsyn --- content/community/meetups.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/content/community/meetups.md b/content/community/meetups.md index 56a0403f5..1d2e48afe 100644 --- a/content/community/meetups.md +++ b/content/community/meetups.md @@ -112,6 +112,9 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet * [Karachi](https://www.facebook.com/groups/902678696597634/) * [Lahore](https://www.facebook.com/groups/ReactjsLahore/) +## Panama {#panama} +* [Panama](https://www.meetup.com/React-Panama/) + ## Peru {#peru} * [Lima](https://www.meetup.com/ReactJS-Peru/) From 5bd73352df2a85e014db5b9e82a18445165d05e4 Mon Sep 17 00:00:00 2001 From: Christophe Porteneuve Date: Tue, 4 Feb 2020 09:58:04 +0100 Subject: [PATCH 3/3] Address all conflicts --- content/community/conferences.md | 4 ++-- content/community/meetups.md | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/content/community/conferences.md b/content/community/conferences.md index 78edc97f6..964ae602e 100644 --- a/content/community/conferences.md +++ b/content/community/conferences.md @@ -95,9 +95,9 @@ Le 1er septembre 2020 à Melbourne, Australie [Site web](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/ComponentsConf) - [Facebook](https://www.facebook.com/ComponentsConf/) - [LinkedIn](https://www.linkedin.com/company/componentsconf/) - [YouTube](https://www.youtube.com/ComponentsConf) ### React Native EU 2020 {#react-native-eu-2020} -September 5-6, 2020 in Wrocław, Poland +Du 5 au 6 septembre 2020 à Wrocław, Pologne -[Website](https://www.react-native.eu/) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu/) - [YouTube](https://www.youtube.com/watch?v=m0GfmlGFh3E&list=PLZ3MwD-soTTHy9_88QPLF8DEJkvoB5Tl-) - [Instagram](https://www.instagram.com/reactnative_eu/) +[Site web](https://www.react-native.eu/) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu/) - [YouTube](https://www.youtube.com/watch?v=m0GfmlGFh3E&list=PLZ3MwD-soTTHy9_88QPLF8DEJkvoB5Tl-) - [Instagram](https://www.instagram.com/reactnative_eu/) ### React India 2020 {#react-india-2020} diff --git a/content/community/meetups.md b/content/community/meetups.md index 43e971674..79a1cca48 100644 --- a/content/community/meetups.md +++ b/content/community/meetups.md @@ -161,17 +161,13 @@ Vous organisez un meetup React.js dans votre ville ? Ajoutez-le ici !
* [Karachi](https://www.facebook.com/groups/902678696597634/) * [Lahore](https://www.facebook.com/groups/ReactjsLahore/) -<<<<<<< HEAD +## Panama {#panama} +* [Panama](https://www.meetup.com/React-Panama/) + ## Pays-Bas {#netherlands} * [Amsterdam](https://www.meetup.com/React-Amsterdam/) ## Pérou {#peru} -======= -## Panama {#panama} -* [Panama](https://www.meetup.com/React-Panama/) - -## Peru {#peru} ->>>>>>> 12eaa7a95df236dc19f9d36893519f2cc2500828 * [Lima](https://www.meetup.com/ReactJS-Peru/) ## Philippines {#philippines}