forgot a comma while resolving a merge conflict. tweet-widget
authorhamidouk
Fri, 18 Nov 2011 16:35:31 +0100
branchtweet-widget
changeset 281 7edd686a2b2a
parent 280 3da58bd31096
child 282 1001234e5e6e
forgot a comma while resolving a merge conflict.
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:{