From 5f60d706ff61b12a54b4ca0cd94d0cd9cb131404 Mon Sep 17 00:00:00 2001
From: acid-burn <acid-burn@opendreambox.org>
Date: Fri, 8 Oct 2010 11:45:50 +0200
Subject: [PATCH 1/1] meta/plugin_graphmultiepg.xml: fix merge conflict

---
 .../Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
index 37d09889..d3a2edf8 100755
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
@@ -7,7 +7,7 @@
                     <author>Dream Multimedia</author>
                     <name>GraphMultiEPG</name>
                     <packagename>enigma2-plugin-extensions-graphmultiepg</packagename>
-                    <shortdescription>GraphMultiEPG shows a graphical timeline EPG</shortdescription>
+		    <shortdescription>GraphMultiEPG shows a graphical timeline EPG</shortdescription>
                     <description>GraphMultiEPG shows a graphical timeline EPG.\nShows a nice overview of all running und upcoming tv shows.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_graphmultiepg_en.jpg" />
           </info>
-- 
2.30.2