Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge conflict

Browse source
This commit is contained in:
Thomas Bruederli 2012-04-21 18:54:39 +02:00
parent e64c624622
commit 8d5bf112fa
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/calendar/skins/larry/calendar.css
View file

@ -1242,11 +1242,7 @@ fieldset #calendarcategories div {
/* Invitation UI in mail */
#messagemenu li a.calendarlink span.calendar {
<<<<<<< HEAD
background-position: 0 -1949px;
=======
background-position: 0px -1948px;
>>>>>>> e666187312ca04384a28a77bf1836db79a97ca52
}
div.calendar-invitebox {