# HG changeset patch # User hamidouk # Date 1321630531 -3600 # Node ID 7edd686a2b2ada60de5a630d7b4f23ad35d98b2a # Parent 3da58bd31096340ad260b6c4a8f1932979d83fad forgot a comma while resolving a merge conflict. diff -r 3da58bd31096 -r 7edd686a2b2a test/integration/polemic-youtube.htm --- a/test/integration/polemic-youtube.htm Fri Nov 18 16:32:32 2011 +0100 +++ b/test/integration/polemic-youtube.htm Fri Nov 18 16:35:31 2011 +0100 @@ -58,7 +58,7 @@ format:'cinelab', src:'polemic_fr.json', type:'json'} - } + }, {type: "PlayerWidget", // please note that type refers directly to the constructor of the widget. mode: "radio", metadata:{