Commit 4184092e authored by svilayphiou's avatar svilayphiou

rm conflict in print.js

parent a6b3cc1f
......@@ -205,22 +205,6 @@ if($("body").hasClass("p-mode")){
$(".page").css("-webkit-transform", "scale(" + zoom + ")");
});
<<<<<<< HEAD
=======
// __________________________________ FOOTNOTES __________________________________ //
setTimeout(function() {
foot = 1;
$("div.footnote").each(function(){
ol = $("ol", $(this));
console.log(foot);
console.log(ol);
height = $(ol).height();
$(ol).css("-webkit-flow-into", "footnotes-" + foot);
$(this).append("<div style='height: " + height + "px; -webkit-flow-from: footnotes-" + foot + ";' class='footnote-column'></div><div style='height: " + height + "px; -webkit-flow-from: footnotes-" + foot + ";' class='footnote-column'></div>");
foot += 1;
});
}, 10000);
>>>>>>> c9e860b... ok, let's not try to gain some space but just to put the footnotes in two columns
}
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment