chore(sync): address all sync conflits, but not extra L10n

reactjs · Oct 18, 2024 · 2287805 · 2287805
1 parent 71f212f
commit 2287805
Show file tree

Hide file tree

Showing 20 changed files with 114 additions and 660 deletions.
diff --git a/src/content/community/acknowledgements.md b/src/content/community/acknowledgements.md
@@ -59,11 +59,7 @@ Nous aimerions remercier particulièrement certaines personnes ayant effectué d
 
 Cette liste n'est pas exhaustive.
 
-<<<<<<< HEAD
 Nous aimerions remercier tout particulièrement [Tom Occhino](https://github.com/tomocchino) et [Adam Wolff](https://github.com/wolffiex) pour leur encadrement et leur soutien au fil des ans. Nous sommes aussi reconnaissants à tou·te·s les bénévoles qui [traduisent React dans d'autres langues](https://translations.react.dev/) (vous trouverez le [détail pour le français ici](https://github.com/reactjs/fr.react.dev/blob/main/TRANSLATORS.md)).
-=======
-We'd like to give special thanks to [Tom Occhino](https://github.com/tomocchino) and [Adam Wolff](https://github.com/wolffiex) for their guidance and support over the years. We are also thankful to all the volunteers who [translated React into other languages.](https://translations.react.dev/)
->>>>>>> 2b2d0f2309f49c82cf5bb88ea62fb2e44661c634
 
 ## Encore quelques mercis {/*additional-thanks*/}
 

diff --git a/src/content/community/conferences.md b/src/content/community/conferences.md
@@ -10,29 +10,6 @@ Vous connaissez une conférence React.js locale ? Ajoutez-la ! (Merci de conse
 
 ## Conférences à venir {/*upcoming-conferences*/}
 
-<<<<<<< HEAD
-### React Nexus 2024 {/*react-nexus-2024*/}
-July 04 & 05, 2024. Bangalore, India (In-person event)
-
-[Site web](https://reactnexus.com/) - [Twitter](https://twitter.com/ReactNexus) - [Linkedin](https://www.linkedin.com/company/react-nexus) - [YouTube](https://www.youtube.com/reactify_in)
-
-### Chain React 2024 {/*chain-react-2024*/}
-July 17-19, 2024. In-person in Portland, OR, USA
-
-[Site web](https://chainreactconf.com) - [Twitter](https://twitter.com/ChainReactConf)
-
-### The Geek Conf 2024 {/*the-geek-conf-2024*/}
-July 25, 2024. In-person in Berlin, Germany + remote (hybrid event)
-
-[Site web](https://thegeekconf.com) - [Twitter](https://twitter.com/thegeekconf)
-
-### React Rally 2024 🐙 {/*react-rally-2024*/}
-August 12-13, 2024. Park City, UT, USA
-
-[Site web](https://reactrally.com) - [Twitter](https://twitter.com/ReactRally) - [YouTube](https://www.youtube.com/channel/UCXBhQ05nu3L1abBUGeQ0ahw)
-
-=======
->>>>>>> 2b2d0f2309f49c82cf5bb88ea62fb2e44661c634
 ### React Universe Conf 2024 {/*react-universe-conf-2024*/}
 September 5-6, 2024. Wrocław, Poland.
 
@@ -46,7 +23,7 @@ September 19-21, 2024. Alicante, Spain.
 ### RenderCon Kenya 2024 {/*rendercon-kenya-2024*/}
 October 04 - 05, 2024. Nairobi, Kenya
 
-[Website](https://rendercon.org/) - [Twitter](https://twitter.com/renderconke) - [LinkedIn](https://www.linkedin.com/company/renderconke/) - [YouTube](https://www.youtube.com/channel/UC0bCcG8gHUL4njDOpQGcMIA)
+[Site web](https://rendercon.org/) - [Twitter](https://twitter.com/renderconke) - [LinkedIn](https://www.linkedin.com/company/renderconke/) - [YouTube](https://www.youtube.com/channel/UC0bCcG8gHUL4njDOpQGcMIA)
 
 ### React India 2024 {/*react-india-2024*/}
 October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - remote day
@@ -61,58 +38,54 @@ October 18, 2024. In-person in Brussels, Belgium (hybrid event)
 ### reactjsday 2024 {/*reactjsday-2024*/}
 October 25, 2024. In-person in Verona, Italy + online (hybrid event)
 
-[Website](https://2024.reactjsday.it/) - [Twitter](https://x.com/reactjsday) - [Facebook](https://www.facebook.com/GrUSP/) - [YouTube](https://www.youtube.com/c/grusp)
+[Site web](https://2024.reactjsday.it/) - [Twitter](https://x.com/reactjsday) - [Facebook](https://www.facebook.com/GrUSP/) - [YouTube](https://www.youtube.com/c/grusp)
 
 ### React Advanced London 2024 {/*react-advanced-london-2024*/}
 October 25 & 28, 2024. In-person in London, UK + online (hybrid event)
 
-[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced)
+[Site web](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced)
 
 ### React Native London Conf 2024 {/*react-native-london-2024*/}
 November 14 & 15, 2024. In-person in London, UK
 
-[Website](https://reactnativelondon.co.uk/) - [Twitter](https://x.com/RNLConf)
+[Site web](https://reactnativelondon.co.uk/) - [Twitter](https://x.com/RNLConf)
 
 ### React Summit US 2024 {/*react-summit-us-2024*/}
 November 19 & 22, 2024. In-person in New York, USA + online (hybrid event)
 
-[Website](https://reactsummit.us/) - [Twitter](https://twitter.com/reactsummit) - [Videos](https://portal.gitnation.org/)
+[Site web](https://reactsummit.us/) - [Twitter](https://twitter.com/reactsummit) - [Videos](https://portal.gitnation.org/)
 
 ### React Africa 2024 {/*react-africa-2024*/}
 November 29, 2024. In-person in Casablanca, Morocco (hybrid event)
 
 [Site web](https://react-africa.com/) - [Twitter](https://x.com/BeJS_)
 
-<<<<<<< HEAD
-## Conférences passées {/*past-conferences*/}
-=======
 ### React Day Berlin 2024 {/*react-day-berlin-2024*/}
 December 13 & 16, 2024. In-person in Berlin, Germany + remote (hybrid event)
 
-[Website](https://reactday.berlin/) - [Twitter](https://x.com/reactdayberlin)
+[Site web](https://reactday.berlin/) - [Twitter](https://x.com/reactdayberlin)
 
-## Past Conferences {/*past-conferences*/}
->>>>>>> 2b2d0f2309f49c82cf5bb88ea62fb2e44661c634
+## Conférences passées {/*past-conferences*/}
 
 ### React Rally 2024 🐙 {/*react-rally-2024*/}
 August 12-13, 2024. Park City, UT, USA
 
-[Website](https://reactrally.com) - [Twitter](https://twitter.com/ReactRally) - [YouTube](https://www.youtube.com/channel/UCXBhQ05nu3L1abBUGeQ0ahw)
+[Site web](https://reactrally.com) - [Twitter](https://twitter.com/ReactRally) - [YouTube](https://www.youtube.com/channel/UCXBhQ05nu3L1abBUGeQ0ahw)
 
 ### The Geek Conf 2024 {/*the-geek-conf-2024*/}
 July 25, 2024. In-person in Berlin, Germany + remote (hybrid event)
 
-[Website](https://thegeekconf.com) - [Twitter](https://twitter.com/thegeekconf)
+[Site web](https://thegeekconf.com) - [Twitter](https://twitter.com/thegeekconf)
 
 ### Chain React 2024 {/*chain-react-2024*/}
 July 17-19, 2024. In-person in Portland, OR, USA
 
-[Website](https://chainreactconf.com) - [Twitter](https://twitter.com/ChainReactConf)
+[Site web](https://chainreactconf.com) - [Twitter](https://twitter.com/ChainReactConf)
 
 ### React Nexus 2024 {/*react-nexus-2024*/}
 July 04 & 05, 2024. Bangalore, India (In-person event)
 
-[Website](https://reactnexus.com/) - [Twitter](https://twitter.com/ReactNexus) - [Linkedin](https://www.linkedin.com/company/react-nexus) - [YouTube](https://www.youtube.com/reactify_in)
+[Site web](https://reactnexus.com/) - [Twitter](https://twitter.com/ReactNexus) - [Linkedin](https://www.linkedin.com/company/react-nexus) - [YouTube](https://www.youtube.com/reactify_in)
 
 ### React Summit 2024 {/*react-summit-2024*/}
 June 14 & 18, 2024. In-person in Amsterdam, Netherlands + remote (hybrid event)

diff --git a/src/content/community/meetups.md b/src/content/community/meetups.md
@@ -59,7 +59,6 @@ Vous connaissez un meetup React.js local ? Ajoutez-le ! (Merci de conserver un
 * [Saskatoon, SK](https://www.meetup.com/saskatoon-react-meetup/)
 * [Toronto, ON](https://www.meetup.com/Toronto-React-Native/events/)
 
-<<<<<<< HEAD
 ## Chili {/*chile*/}
 * [Santiago](https://www.meetup.com/es-ES/react-santiago/)
 
@@ -68,99 +67,13 @@ Vous connaissez un meetup React.js local ? Ajoutez-le ! (Merci de conserver un
 
 ## Colombie {/*colombia*/}
 * [Bogotá](https://www.meetup.com/meetup-group-iHIeHykY/)
-=======
-## Colombia {/*colombia*/}
->>>>>>> 2b2d0f2309f49c82cf5bb88ea62fb2e44661c634
 * [Medellin](https://www.meetup.com/React-Medellin/)
 
 ## Danemark {/*denmark*/}
 * [Aalborg](https://www.meetup.com/Aalborg-React-React-Native-Meetup/)
 * [Aarhus](https://www.meetup.com/Aarhus-ReactJS-Meetup/)
 
-<<<<<<< HEAD
 ## Écosse (R.-U.) {/*scotland-uk*/}
-=======
-## England (UK) {/*england-uk*/}
-* [Manchester](https://www.meetup.com/Manchester-React-User-Group/)
-* [React.JS Girls London](https://www.meetup.com/ReactJS-Girls-London/)
-* [React Advanced London](https://guild.host/react-advanced-london)
-* [React Native London](https://guild.host/RNLDN)
-
-## France {/*france*/}
-* [Lille](https://www.meetup.com/ReactBeerLille/)
-* [Paris](https://www.meetup.com/ReactJS-Paris/)
-
-## Germany {/*germany*/}
-* [Cologne](https://www.meetup.com/React-Cologne/)
-* [Düsseldorf](https://www.meetup.com/de-DE/ReactJS-Meetup-Dusseldorf/)
-* [Hamburg](https://www.meetup.com/Hamburg-React-js-Meetup/)
-* [Karlsruhe](https://www.meetup.com/react_ka/)
-* [Kiel](https://www.meetup.com/Kiel-React-Native-Meetup/)
-* [Munich](https://www.meetup.com/ReactJS-Meetup-Munich/)
-* [React Berlin](https://guild.host/react-berlin)
-
-## Greece {/*greece*/}
-* [Athens](https://www.meetup.com/React-To-React-Athens-MeetUp/)
-* [Thessaloniki](https://www.meetup.com/Thessaloniki-ReactJS-Meetup/)
-
-## India {/*india*/}
-* [Ahmedabad](https://www.meetup.com/react-ahmedabad/)
-* [Bangalore (React)](https://www.meetup.com/ReactJS-Bangalore/)
-* [Bangalore (React Native)](https://www.meetup.com/React-Native-Bangalore-Meetup)
-* [Chennai](https://www.linkedin.com/company/chennaireact)
-* [Delhi NCR](https://www.meetup.com/React-Delhi-NCR/)
-* [Mumbai](https://reactmumbai.dev)
-* [Pune](https://www.meetup.com/ReactJS-and-Friends/)
-
-## Indonesia {/*indonesia*/}
-* [Indonesia](https://www.meetup.com/reactindonesia/)
-
-## Ireland {/*ireland*/}
-* [Dublin](https://guild.host/reactjs-dublin)
-
-## Israel {/*israel*/}
-* [Tel Aviv](https://www.meetup.com/ReactJS-Israel/)
-
-## Italy {/*italy*/}
-* [Milan](https://www.meetup.com/React-JS-Milano/)
-
-## Japan {/*japan*/}
-* [Osaka](https://react-osaka.connpass.com/)
-
-## Kenya {/*kenya*/}
-* [Nairobi - Reactdevske](https://kommunity.com/reactjs-developer-community-kenya-reactdevske)
-
-## Malaysia {/*malaysia*/}
-* [Kuala Lumpur](https://www.kl-react.com/)
-* [Penang](https://www.facebook.com/groups/reactpenang/)
-
-## Netherlands {/*netherlands*/}
-* [Amsterdam](https://guild.host/react-amsterdam)
-
-## New Zealand {/*new-zealand*/}
-* [Wellington](https://www.meetup.com/React-Wellington/)
-
-## Norway {/*norway*/}
-* [Norway](https://reactjs-norway.webflow.io/)
-* [Oslo](https://www.meetup.com/ReactJS-Oslo-Meetup/)
-
-## Pakistan {/*pakistan*/}
-* [Karachi](https://www.facebook.com/groups/902678696597634/)
-* [Lahore](https://www.facebook.com/groups/ReactjsLahore/)
-
-## Philippines {/*philippines*/}
-* [Manila](https://www.meetup.com/reactjs-developers-manila/)
-* [Manila - ReactJS PH](https://www.meetup.com/ReactJS-Philippines/)
-
-## Poland {/*poland*/}
-* [Warsaw](https://www.meetup.com/React-js-Warsaw/)
-* [Wrocław](https://www.meetup.com/ReactJS-Wroclaw/)
-
-## Portugal {/*portugal*/}
-* [Lisbon](https://www.meetup.com/JavaScript-Lisbon/)
-
-## Scotland (UK) {/*scotland-uk*/}
->>>>>>> 2b2d0f2309f49c82cf5bb88ea62fb2e44661c634
 * [Edinburgh](https://www.meetup.com/React-Scotland/)
 
 ## Égypte {/*egypt*/}
@@ -169,25 +82,8 @@ Vous connaissez un meetup React.js local ? Ajoutez-le ! (Merci de conserver un
 ## Espagne {/*spain*/}
 * [Barcelona](https://www.meetup.com/ReactJS-Barcelona/)
 
-<<<<<<< HEAD
 ## États-Unis {/*us*/}
 * [Ann Arbor, MI - ReactJS](https://www.meetup.com/AnnArbor-jsx/)
-=======
-## Sweden {/*sweden*/}
-* [Goteborg](https://www.meetup.com/ReactJS-Goteborg/)
-* [Stockholm](https://www.meetup.com/Stockholm-ReactJS-Meetup/)
-
-## Switzerland {/*switzerland*/}
-* [Zurich](https://www.meetup.com/Zurich-ReactJS-Meetup/)
-
-## Turkey {/*turkey*/}
-* [Istanbul](https://kommunity.com/reactjs-istanbul)
-
-## Ukraine {/*ukraine*/}
-* [Kyiv](https://www.meetup.com/Kyiv-ReactJS-Meetup)
-
-## US {/*us*/}
->>>>>>> 2b2d0f2309f49c82cf5bb88ea62fb2e44661c634
 * [Atlanta, GA - ReactJS](https://www.meetup.com/React-ATL/)
 * [Austin, TX - ReactJS](https://www.meetup.com/ReactJS-Austin-Meetup/)
 * [Boston, MA - ReactJS](https://www.meetup.com/ReactJS-Boston/)
@@ -226,22 +122,18 @@ Vous connaissez un meetup React.js local ? Ajoutez-le ! (Merci de conserver un
 * [Washington, DC - ReactJS](https://www.meetup.com/React-DC/)
 
 ## France {/*france*/}
-* [Nantes](https://www.meetup.com/React-Nantes/)
 * [Lille](https://www.meetup.com/ReactBeerLille/)
 * [Paris](https://www.meetup.com/ReactJS-Paris/)
 
 ## Grèce {/*greece*/}
 * [Athens](https://www.meetup.com/React-To-React-Athens-MeetUp/)
 * [Thessaloniki](https://www.meetup.com/Thessaloniki-ReactJS-Meetup/)
 
-## Hongrie {/*hungary*/}
-* [Budapest](https://www.meetup.com/React-Budapest/)
-
 ## Inde {/*india*/}
 * [Ahmedabad](https://www.meetup.com/react-ahmedabad/)
 * [Bangalore (React)](https://www.meetup.com/ReactJS-Bangalore/)
 * [Bangalore (React Native)](https://www.meetup.com/React-Native-Bangalore-Meetup)
-* [Chennai](https://www.meetup.com/React-Chennai/)
+* [Chennai](https://www.linkedin.com/company/chennaireact)
 * [Delhi NCR](https://www.meetup.com/React-Delhi-NCR/)
 * [Mumbai](https://reactmumbai.dev)
 * [Pune](https://www.meetup.com/ReactJS-and-Friends/)
@@ -252,12 +144,15 @@ Vous connaissez un meetup React.js local ? Ajoutez-le ! (Merci de conserver un
 ## Irlande {/*ireland*/}
 * [Dublin](https://guild.host/reactjs-dublin)
 
-## Israël {/*israel*/}
+## Israel {/*israel*/}
 * [Tel Aviv](https://www.meetup.com/ReactJS-Israel/)
 
 ## Italie {/*italy*/}
 * [Milan](https://www.meetup.com/React-JS-Milano/)
 
+## Japon {/*japan*/}
+* [Osaka](https://react-osaka.connpass.com/)
+
 ## Kenya {/*kenya*/}
 * [Nairobi - Reactdevske](https://kommunity.com/reactjs-developer-community-kenya-reactdevske)
 
@@ -276,15 +171,9 @@ Vous connaissez un meetup React.js local ? Ajoutez-le ! (Merci de conserver un
 * [Karachi](https://www.facebook.com/groups/902678696597634/)
 * [Lahore](https://www.facebook.com/groups/ReactjsLahore/)
 
-## Panama {/*panama*/}
-* [Panama](https://www.meetup.com/React-Panama/)
-
 ## Pays-Bas {/*netherlands*/}
 * [Amsterdam](https://guild.host/react-amsterdam)
 
-## Pérou {/*peru*/}
-* [Lima](https://www.meetup.com/ReactJS-Peru/)
-
 ## Philippines {/*philippines*/}
 * [Manila](https://www.meetup.com/reactjs-developers-manila/)
 * [Manila - ReactJS PH](https://www.meetup.com/ReactJS-Philippines/)

diff --git a/src/content/learn/conditional-rendering.md b/src/content/learn/conditional-rendering.md
@@ -52,11 +52,7 @@ export default function PackingList() {
 
 </Sandpack>
 
-<<<<<<< HEAD
-Remarquez que certains composants `Item` ont leur prop `isPacked` à `true` plutôt qu'à `false`.  Vous souhaitez ajouter une coche (✔) aux objets pour lesquels `isPacked={true}`.
-=======
-Notice that some of the `Item` components have their `isPacked` prop set to `true` instead of `false`. You want to add a checkmark (✅) to packed items if `isPacked={true}`.
->>>>>>> 2b2d0f2309f49c82cf5bb88ea62fb2e44661c634
+Remarquez que certains composants `Item` ont leur prop `isPacked` à `true` plutôt qu'à `false`.  Vous souhaitez ajouter une coche (✅) aux objets pour lesquels `isPacked={true}`.
 
 Vous pourriez écrire ça sous forme [d'instruction `if`/`else`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/if...else), comme ceci :
 
@@ -206,11 +202,7 @@ return (
 );
 ```
 
-<<<<<<< HEAD
-Vous pouvez le lire comme suit : *« si `isPacked` est vrai, alors (`?`) affiche `name + ' ✔'`, sinon (`:`) affiche `name` »*.
-=======
-You can read it as *"if `isPacked` is true, then (`?`) render `name + ' ✅'`, otherwise (`:`) render `name`"*.
->>>>>>> 2b2d0f2309f49c82cf5bb88ea62fb2e44661c634
+Vous pouvez le lire comme suit : *« si `isPacked` est vrai, alors (`?`) affiche `name + ' ✅'`, sinon (`:`) affiche `name` »*.
 
 <DeepDive>
 

diff --git a/src/content/learn/synchronizing-with-effects.md b/src/content/learn/synchronizing-with-effects.md
@@ -626,11 +626,7 @@ Parcourez les exemples ci-dessous pour découvrir comment gérer les cas les plu
 
 ### Contrôler des widgets non-React {/*controlling-non-react-widgets*/}
 
-<<<<<<< HEAD
 Vous aurez parfois besoin d'ajouter des widgets d’UI qui ne sont pas écrits en React. Par exemple, imaginons que vous souhaitiez ajouter un composant carte à votre page.  Il dispose d’une méthode `setZoomLevel()` et vous aimeriez synchroniser son niveau de zoom avec une variable d’état `zoomLevel` dans votre code React. L’Effet pour y parvenir ressemblerait à ceci :
-=======
-Sometimes you need to add UI widgets that aren't written in React. For example, let's say you're adding a map component to your page. It has a `setZoomLevel()` method, and you'd like to keep the zoom level in sync with a `zoomLevel` state variable in your React code. Your Effect would look similar to this:
->>>>>>> 2b2d0f2309f49c82cf5bb88ea62fb2e44661c634
 
 ```js
 useEffect(() => {

diff --git a/src/content/learn/thinking-in-react.md b/src/content/learn/thinking-in-react.md
@@ -265,19 +265,11 @@ Lors de l'étape précédente, vous avez trouvé deux éléments d'état pour ce
 
 Déroulons notre stratégie pour eux :
 
-<<<<<<< HEAD
 1. **Identifier les composants qui utilisent l'état** :
     - `ProductTable` a besoin de filtrer la liste des produits sur base de cet état (texte de la recherche et état de la case à cocher).
     - `SearchBar` a besoin d'afficher cet état (texte de la recherche et état de la case à cocher).
 2. **Trouver leur ancêtre commun** : le plus proche ancêtre commun à ces deux composants est `FilterableProductTable`.
 3. **Décider où l'état devrait vivre** : nous stockerons le texte de la recherche et l'état de la case à cocher dans `FilterableProductTable`.
-=======
-1. **Identify components that use state:**
-    * `ProductTable` needs to filter the product list based on that state (search text and checkbox value). 
-    * `SearchBar` needs to display that state (search text and checkbox value).
-2. **Find their common parent:** The first parent component both components share is `FilterableProductTable`.
-3. **Decide where the state lives**: We'll keep the filter text and checked state values in `FilterableProductTable`.
->>>>>>> 2b2d0f2309f49c82cf5bb88ea62fb2e44661c634
 
 Ainsi, les valeurs d'état vivront dans `FilterableProductTable`.
 

diff --git a/src/content/learn/tutorial-tic-tac-toe.md b/src/content/learn/tutorial-tic-tac-toe.md
@@ -1139,11 +1139,7 @@ On appelle alors la fonction `setSquares` pour avertir React que l'état du comp
 
 <Note>
 
-<<<<<<< HEAD
-JavaScript utilise des [fermetures lexicales](https://developer.mozilla.org/docs/Web/JavaScript/Closures), ce qui signifie qu'une fonction imbriquée (ex. `handleClick`) a accès aux variables et fonctions définies dans une fonction englobante (ex. `Board`). La fonction `handleClick` peut lire l'état `squares` et appeler la fonction `setSquares` parce que les deux sont définis dans la fonction`Board`.
-=======
-JavaScript supports [closures](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Closures) which means an inner function (e.g. `handleClick`) has access to variables and functions defined in an outer function (e.g. `Board`). The `handleClick` function can read the `squares` state and call the `setSquares` method because they are both defined inside of the `Board` function.
->>>>>>> 2b2d0f2309f49c82cf5bb88ea62fb2e44661c634
+JavaScript utilise des [fermetures lexicales](https://developer.mozilla.org/docs/Web/JavaScript/Closures), ce qui signifie qu'une fonction imbriquée (ex. `handleClick`) a accès aux variables et fonctions définies dans une fonction englobante (ex. `Board`). La fonction `handleClick` peut lire l'état `squares` et appeler la fonction `setSquares` parce que les deux sont définis dans la fonction `Board`.
 
 </Note>
 

diff --git a/src/content/learn/updating-objects-in-state.md b/src/content/learn/updating-objects-in-state.md
@@ -379,11 +379,7 @@ Notez que la syntaxe de *spread* `...` est « superficielle » : elle ne réa
 
 #### Utiliser un seul gestionnaire d’événement pour plusieurs champs {/*using-a-single-event-handler-for-multiple-fields*/}
 
-<<<<<<< HEAD
 Vous pouvez également utiliser les crochets `[` et `]` à l’intérieur de la définition de votre objet pour spécifier une propriété avec un nom dynamique. Voici le même exemple, mais avec un seul gestionnaire d’événement au lieu de trois différents :
-=======
-You can also use the `[` and `]` braces inside your object definition to specify a property with a dynamic name. Here is the same example, but with a single event handler instead of three different ones:
->>>>>>> 2b2d0f2309f49c82cf5bb88ea62fb2e44661c634
 
 <Sandpack>