From 159553ff8c2e491562f1372eb9bfa766b24a93bd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 22 May 2015 10:38:40 +0200
Subject: [PATCH] remove fragement

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

diff --git a/source/components/index.markdown b/source/components/index.markdown
index fc92a0e1041..dd3492a4ae1 100644
--- a/source/components/index.markdown
+++ b/source/components/index.markdown
@@ -226,7 +226,6 @@ the manufacturers of these devices.
 <td><img src='/images/supported_brands/openweathermap.png' class='brand' /></td>
 <td><a href='/components/sensor.openweathermap.html'>OpenWeatherMap</a></td>
 <td>Display current meteorological data from your location.</td>
-<<<<<<< HEAD
 </tr>
 
 <tr>