From 005f777bdae39c0dd0038165c1dd833a995fc3c2 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Thu, 2 Nov 2017 09:34:32 -0700 Subject: [PATCH] Fix merge conflict --- source/_components/sensor.sytadin.markdown | 7 ------- 1 file changed, 7 deletions(-) diff --git a/source/_components/sensor.sytadin.markdown b/source/_components/sensor.sytadin.markdown index a402c54643e..9f23c8df3f8 100644 --- a/source/_components/sensor.sytadin.markdown +++ b/source/_components/sensor.sytadin.markdown @@ -27,15 +27,8 @@ Configuration variables: - **name** (*Optional*): Additional name for the sensors. Default to platform name. - **monitored_conditions** array (*Optional*): Conditions to display in the frontend. Defaults to `traffic_jam`. -<<<<<<< HEAD - **traffic_jam**: Amount of kilometers in traffic jam (km). - **mean_velocity**: Mean velocity (km/h). - **congestion**: Index of congestion (n/a). -======= - - **traffic_jam**: A human-readable text summary. - - **mean_velocity**: The current temperature. - - **congestion**: The wind speed. - ->>>>>>> current The data is coming from the [Direction des routes Île-de-France (DiRIF)](http://www.sytadin.fr).