Skip to content

Commit 005f777

Browse files
committed
Fix merge conflict
1 parent 2581fb1 commit 005f777

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

source/_components/sensor.sytadin.markdown

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,8 @@ Configuration variables:
2727
2828
- **name** (*Optional*): Additional name for the sensors. Default to platform name.
2929
- **monitored_conditions** array (*Optional*): Conditions to display in the frontend. Defaults to `traffic_jam`.
30-
<<<<<<< HEAD
3130
- **traffic_jam**: Amount of kilometers in traffic jam (km).
3231
- **mean_velocity**: Mean velocity (km/h).
3332
- **congestion**: Index of congestion (n/a).
34-
=======
35-
- **traffic_jam**: A human-readable text summary.
36-
- **mean_velocity**: The current temperature.
37-
- **congestion**: The wind speed.
38-
39-
>>>>>>> current
4033

4134
The data is coming from the [Direction des routes Île-de-France (DiRIF)](http://www.sytadin.fr).

0 commit comments

Comments
 (0)