From 4d97ea106cf45f9dd191358dc6bde3a7fab438c1 Mon Sep 17 00:00:00 2001
From: Haakon Meland Eriksen <haakon.eriksen@far.no>
Date: Sun, 29 Nov 2015 11:55:39 +0100
Subject: Resolving merge conflict

---
 view/tpl/event_head.tpl | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'view/tpl/event_head.tpl')

diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 496a07782..dc98d14b3 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -58,11 +58,8 @@
 				$('#events-spinner').spin('tiny');
 				$('#events-spinner > i').css('color', 'transparent');
 				if(!isLoading) {
-<<<<<<< HEAD
-=======
 					$('#events-spinner').spin(false);
 					$('#events-spinner > i').css('color', '');
->>>>>>> upstream/master
 					$('td.fc-day').dblclick(function() {
 						openMenu('form');
 						//window.location.href='/events/new?start='+$(this).data('date');
@@ -78,11 +75,7 @@
 				switch(view.name){
 					case "month":
 					element.find(".fc-title").html(
-<<<<<<< HEAD
-						"<img src='{0}' style='height:10px;width:10px'>&nbsp;{1}: {2}".format(
-=======
 						"<img src='{0}' style='height:12px;width:12px;' title='{1}'>&nbsp;<span title='{3}{4}'>{2}</span>".format(
->>>>>>> upstream/master
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title,
@@ -92,40 +85,22 @@
 					break;
 					case "agendaWeek":
 					element.find(".fc-title").html(
-<<<<<<< HEAD
-						"<img src='{0}' style='height:10px; width:10px'>&nbsp;{1}: {2}<p>{3}</p><p>{4}</p>".format(
-							event.item['author']['xchan_photo_s'],
-							event.item['author']['xchan_name'],
-							event.title,
-							event.item.description,
-							event.item.location
-=======
 						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title,
 							event.item.description ? event.item.description + "\r\n\r\n" : '',
 							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
->>>>>>> upstream/master
 					));
 					break;
 					case "agendaDay":
 					element.find(".fc-title").html(
-<<<<<<< HEAD
-						"<img src='{0}' style='height:10px;width:10px'>&nbsp;{1}: {2}<p>{3}</p><p>{4}</p>".format(
-							event.item['author']['xchan_photo_s'],
-							event.item['author']['xchan_name'],
-							event.title,
-							event.item.description,
-							event.item.location
-=======
 						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title,
 							event.item.description ? event.item.description + "\r\n\r\n" : '',
 							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
->>>>>>> upstream/master
 					));
 					break;
 				}
-- 
cgit v1.2.3