merge conflict

This commit is contained in:
Bala Clark 2013-08-18 22:45:04 +02:00
commit 4aaab294a0

View file

@ -96,6 +96,7 @@ var ComicBook = (function ($) {
this.isMobile = true; this.isMobile = true;
document.body.classList.add('mobile'); document.body.classList.add('mobile');
defaults.displayMode = 'single'; defaults.displayMode = 'single';
window.addEventListener('load', function () { window.addEventListener('load', function () {
setTimeout(function () { setTimeout(function () {
window.scrollTo(0, 1); window.scrollTo(0, 1);