elias/vdo.ninja
1
0
Fork 0
mirror of https://github.com/eliasstepanik/vdo.ninja.git synced 2026-01-17 16:48:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

conflict fix

Browse Source
This commit is contained in:
steveseguin 2023-04-10 19:11:56 -04:00
commit f962d9a6f2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
index.html
View File

@ -56,7 +56,7 @@
<meta property="twitter:image" content="./media/vdoNinja_logo_full.png" />
<meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#ffffff" />
<link rel="stylesheet" href="./main.css?ver=285" />
<link rel="stylesheet" href="./main.css?ver=286" />
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/adapter.js"></script>
<style id="lightbox-animations" type="text/css"></style>
<!-- <link rel="manifest" href="manifest.json" /> -->
@ -2494,11 +2494,11 @@
// session.hidehome = true; // If used, 'hide home' will make the landing page inaccessible, along with hiding a few go-home elements.
// session.record = false; // uncomment to block users from being able to record via vdo.ninja's built in recording function
</script>
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=724"></script>
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=726"></script>
<!--
// 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" crossorigin="anonymous" id="main-js" src="./main.js?ver=584"></script>
<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=585"></script>
</body>
</html>

4
lib.js
View File

@ -24131,7 +24131,7 @@ function updateDirectorsAudio(dataN, UUID) {
label.innerText = data.trackLabel;
label.style.display = "block";
label.id = "remoteAudioLabel_"+UUID;
label.classList.add("settingsLabel");
label.classList.add("settingsLabel");
label.dataset.UUID = UUID;
audioEle.appendChild(label);
}
@ -35204,4 +35204,4 @@ function createControlBoxScreenshare(UUID, soloLink, streamID) {
initSceneList(UUID);
pokeIframeAPI("control-box", true, UUID);
}
}