BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

missed on conflict on bbb/master sync

Browse Source
This commit is contained in:
Leif Jackson 2010-07-11 04:40:30 +00:00
parent f236dc5c1c
commit ab51ca68de
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigbluebutton-client/resources/prod/BigBlueButton.html
View File

@ -66,11 +66,7 @@ if ( hasProductInstall && !hasRequestedVersion ) {
// see. http://stackoverflow.com/questions/313966/mousewheel-not-working-when-published-movie-has-wmodetransparent
// ralam (mar 31, 2010)
AC_FL_RunContent(
<<<<<<< HEAD:bigbluebutton-client/resources/BigBlueButton.html
"src", "BigBlueButton",
=======
"src", "BigBlueButton.swf?v=VERSION",
>>>>>>> bbb/master:bigbluebutton-client/resources/prod/BigBlueButton.html
"width", "100%",
"height", "100%",
"align", "middle",