From 238c1a364b96fbb36a64b5c78e50becd140c9188 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 May 2015 10:32:33 +0200
Subject: [PATCH] remove fragement from last merge

---
 source/components/index.markdown | 2 --
 1 file changed, 2 deletions(-)

diff --git a/source/components/index.markdown b/source/components/index.markdown
index 2732a2755dd..fc92a0e1041 100644
--- a/source/components/index.markdown
+++ b/source/components/index.markdown
@@ -233,8 +233,6 @@ the manufacturers of these devices.
 <td><img src='/images/supported_brands/bitcoin.png' class='brand' /></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>
-=======
->>>>>>> f9261e70a652b2bcd1f852f2cdc93ad21184e594
 </tr>
 
 <tr>