Skip to content

Commit 87fde01

Browse files
committed
Fix contributing file
1 parent 2fdff99 commit 87fde01

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ Thank you so much to anyone that would!
55

66
To get you started you can check out [the `<Alert />` component](https://react-dsfr-components.etalab.studio/?path=/docs/components-alert--default).
77

8-
<<<<<<< HEAD
9-
10-
- # Here is it's definition from the SIG: [systeme-de-design.gouv.fr/elements-d-interface/composants/alerte](https://www.systeme-de-design.gouv.fr/elements-d-interface/composants/alerte) (Pro tip: the real source of tuth for DSFR component is [here](https://main--ds-gouv.netlify.app/example/component/))
11-
- Here is it's definition from the SIG: [systeme-de-design.gouv.fr/elements-d-interface/composants/alerte](https://www.systeme-de-design.gouv.fr/elements-d-interface/composants/alerte) (Pro tip: the real source of tuth for DSFR component is [here](https://main--ds-gouv.netlify.app/example/component/))
12-
> > > > > > > d5eb7390b1656914484b05eba861c2bdf4764ed7
8+
- Here is it's definition from the SIG: [systeme-de-design.gouv.fr/elements-d-interface/composants/alerte](https://www.systeme-de-design.gouv.fr/elements-d-interface/composants/alerte) (Pro tip: the real source of truth for DSFR component is [here](https://main--ds-gouv.netlify.app/example/component/))
139
- Here is its implementation [src/Alert.tsx](https://github.com/codegouvfr/react-dsfr/blob/main/src/Alert.tsx)
1410
- Here is the file that generates its documentation: [stories/Alert.stories.tsx](https://github.com/codegouvfr/react-dsfr/blob/main/stories/Alert.stories.tsx)
1511

0 commit comments

Comments
 (0)