From b8fb31c6c5ee9f33c76d296cf72a095d78223117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20H=C3=A4usler?= Date: Fri, 28 Dec 2012 17:58:48 +0100 Subject: [PATCH] impossible merge fail --- public/css/scrolltable.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/public/css/scrolltable.js b/public/css/scrolltable.js index 82224e31..1319495c 100644 --- a/public/css/scrolltable.js +++ b/public/css/scrolltable.js @@ -12,11 +12,7 @@ function scrolltable(elem) { elem.className = elem.className + ' scrollable'; var tbodywidth = widths.pop(); tbody.style.width = (tbodywidth + 16) + 'px'; -<<<<<<< HEAD - tbody.style.height = (window.innerHeight - 50) + 'px'; -======= tbody.style.height = (window.innerHeight - 100) + 'px'; ->>>>>>> cc8f117ed128cf9b046f9835640b84362d151883 for(var i = 0; i < ths.length; i++) { var paddingLeft = parseInt(window.getComputedStyle(ths[i], null).getPropertyValue('padding-left')); var paddingRight = parseInt(window.getComputedStyle(ths[i], null).getPropertyValue('padding-right'));