elias/vdo.ninja
1
0
Fork 0
mirror of https://github.com/eliasstepanik/vdo.ninja.git synced 2026-01-27 21:38:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge error fix

Browse Source
This commit is contained in:
STeve Seguin 2020-12-11 09:39:18 -05:00
parent e8d5fca0d0
commit 99cdff796d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -928,8 +928,8 @@
<!-- <!--
// If you wish to change branding, blank offers a good clean start. // If you wish to change branding, blank offers a good clean start.
<script type="text/javascript" id="main-js" src="./main.js" data-translation="blank"></script> <script type="text/javascript" id="main-js" src="./main.js" data-translation="blank"></script>
-->
<script type="text/javascript" crossorigin="anonymous" id="mixer-js" src="./mixer.js?ver=2"></script> <script type="text/javascript" crossorigin="anonymous" id="mixer-js" src="./mixer.js?ver=2"></script>
-->
<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=93"></script> <script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=93"></script>
<script type="text/javascript" crossorigin="anonymous" src="./animations.js?ver=13"></script> <script type="text/javascript" crossorigin="anonymous" src="./animations.js?ver=13"></script>
</body> </body>

2
main.js
View File

@ -3509,7 +3509,7 @@ function createRoomCallback(passAdd, passAdd2){
} }
if (codecGroupFlag){ if (codecGroupFlag){
session.codecGroupFlag = codecGroupFlag; session.codecGroupFlag = codecGroupFlag;
}
formSubmitting = false; formSubmitting = false;

2
webrtc.js
View File

File diff suppressed because one or more lines are too long