jeena/home-assistant.github.io
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

remove fragements from last merge (is already fixed in source)

Browse source
This commit is contained in:
Fabian Affolter 2015-05-22 10:44:21 +02:00
parent dc82fc088e
commit 9c28ed0433
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/index.html
View file

@ -341,15 +341,12 @@ the manufacturers of these devices.
<td><img src='/images/supported_brands/openweathermap.png' class='brand' /></td> <td><img src='/images/supported_brands/openweathermap.png' class='brand' /></td>
<td><a href='/components/sensor.openweathermap.html'>OpenWeatherMap</a></td> <td><a href='/components/sensor.openweathermap.html'>OpenWeatherMap</a></td>
<td>Display current meteorological data from your location.</td> <td>Display current meteorological data from your location.</td>
<<<<<<< HEAD
</tr> </tr>
<tr> <tr>
<td><img src='/images/supported_brands/bitcoin.png' class='brand' /></td> <td><img src='/images/supported_brands/bitcoin.png' class='brand' /></td>
<td><a href='/components/sensor.bitcoin.html'>Bitcoin</a></td> <td><a href='/components/sensor.bitcoin.html'>Bitcoin</a></td>
<td>Display details about the Bitcoin Network and your Blockchain.info online wallet.</td> <td>Display details about the Bitcoin Network and your Blockchain.info online wallet.</td>
=======
>>>>>>> f9261e70a652b2bcd1f852f2cdc93ad21184e594
</tr> </tr>
<tr> <tr>
@ -463,4 +460,4 @@ the service providers.
</body> </body>
</html> </html>