meta/plugin_graphmultiepg.xml: fix merge conflict
authoracid-burn <acid-burn@opendreambox.org>
Fri, 8 Oct 2010 09:45:50 +0000 (11:45 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Fri, 8 Oct 2010 09:45:50 +0000 (11:45 +0200)
commit5f60d706ff61b12a54b4ca0cd94d0cd9cb131404
tree08dc69b79dcbb050b52cb6f3b1969991ee9a340a
parent88e31943f018bc4ba2d7b63bafb8f9129114877a
meta/plugin_graphmultiepg.xml: fix merge conflict
lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml