remove fragement from last merge
This commit is contained in:
parent
ddef607692
commit
238c1a364b
1 changed files with 0 additions and 2 deletions
|
@ -233,8 +233,6 @@ the manufacturers of these devices.
|
||||||
<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>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue