[checkmk-commits] Check_MK Git: check_mk: Fixed merge problem during style cleanup

Module: check_mk Branch: master Commit: be51eaf742dbbf45f8f863fe701ff6867f84cc48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be51eaf742dbbf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 26 15:34:04 2011 +0200 Fixed merge problem during style cleanup --- web/htdocs/check_mk.css | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 6e5d6c3..a04d71d 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -743,16 +743,6 @@ td.perfometer img.glass { height: 22px; margin-bottom: 1px; z-index: 30; -======= -td.perfometer div.title { - height: 0px; - position: relative; - top: 3px; - left: 0px; - width: 120px; - text-align: center; - white-space: nowrap; ->>>>>>> A lot of additional styling cleanups }