Fixed a git error

This commit is contained in:
Paulin Jorys 2017-07-11 16:25:18 +02:00
parent 7517e379c5
commit e1616df7b4

View File

@ -747,11 +747,7 @@ function saveRemoteAudio() {
// checking the new state // checking the new state
setTimeout(function() { setTimeout(function() {
var remoteAudioState = $("#remoteAudioEnabledSwitch").parent().hasClass('is-checked'); var remoteAudioState = $("#remoteAudioEnabledSwitch").parent().hasClass('is-checked');
<<<<<<< HEAD
console.log('%c[index.js, saveRemoteAudio]', 'color: green;', 'Saving remote audio state : ' + remoteAudioState); console.log('%c[index.js, saveRemoteAudio]', 'color: green;', 'Saving remote audio state : ' + remoteAudioState);
=======
console.log('[index.js, saveRemoteAudio]', 'color: green;', 'Saving remote audio state : ' + remoteAudioState);
>>>>>>> 66da3a7c871a55d13807c137b9f8d13654b46267
storeData('remoteAudio', remoteAudioState, null); storeData('remoteAudio', remoteAudioState, null);
}, 100); }, 100);
} }