meta/plugin_graphmultiepg.xml: fix merge conflict

[enigma2.git] / lib / python / Plugins / Extensions / GraphMultiEPG / meta / plugin_graphmultiepg.xml

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
index 37d098898ca7cba33c12963f1aa35f81ca4d79e9..d3a2edf8d7ef58d58249877c73cbb779f2bae2b4 100755 (executable)
--- 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>