From 8d5bf112fa066bd0460ba6e66fb55b342896d85a Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Sat, 21 Apr 2012 18:54:39 +0200
Subject: [PATCH] Fix merge conflict

---
 plugins/calendar/skins/larry/calendar.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 54849aaf..a95d0fcb 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -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 {