Remove merge conflict

Thomas Bruederli

2014-01-16 25a244908b21b097f744c7194e4862ca6ebda391

1
2
3
4
5
6
.panel_wrapper {height:85px;} 
.panel_wrapper div.current {height:85px;} 
 
/* IE */ 
* html .panel_wrapper {height:100px;} 
* html .panel_wrapper div.current {height:100px;}