Permalink
Browse files

adding liveblog

  • Loading branch information...
1 parent a3b6622 commit 0a343d1864bf44b5c69d73fc0074e33948647317 @cjoh committed Jan 16, 2012
Showing with 5 additions and 1 deletion.
  1. +5 −1 live.markdown
View
@@ -8,6 +8,10 @@ parenttitle: Resources
<iframe src="http://www.ustream.tv/embed/10187973" width="608" height="368" scrolling="no" frameborder="0" style="border: 0px none transparent;"></iframe><br /><a href="http://www.ustream.tv/" style="padding: 2px 0px 4px; width: 400px; background: #ffffff; display: block; color: #000000; font-weight: normal; font-size: 10px; text-decoration: underline; text-align: center;" target="_blank">Free live streaming by Ustream</a>
+<<<<<<< HEAD
#Liveblog
-<iframe src='http://embed.scribblelive.com/Embed/v5.aspx?Id=36954&ThemeId=4065' width='550' height='600' frameborder='0' style='border: 1px solid #000'></iframe>
+<iframe src='http://embed.scribblelive.com/Embed/v5.aspx?Id=36954&ThemeId=4065' width='550' height='600' frameborder='0' style='border: 1px solid #000'></iframe>
+=======
+<iframe src='http://embed.scribblelive.com/Embed/v5.aspx?Id=36954&ThemeId=4065' width='550' height='600' frameborder='0' style='border: 1px solid #000'></iframe>
+>>>>>>> adding liveblog

0 comments on commit 0a343d1

Please sign in to comment.