Resolving merge conflict

view/theme/redbasic/css/style.css

@@ -848,71 +848,6 @@ nav .acpopup {
   cursor: pointer;
 }
 
-<<<<<<< HEAD
-.fc-unthemed th,
-.fc-unthemed td,
-.fc-unthemed thead,
-.fc-unthemed tbody,
-.fc-unthemed .fc-divider,
-.fc-unthemed .fc-row,
-.fc-unthemed .fc-popover {
-	border-color: #ccc !important;
-}
-
-.wall-event-item {
-	padding: 10px;
-	color: #fff;
-	background-color: #3A87AD; /* should reflect calendar color */
-	border-top-left-radius: $radiuspx;
-	border-top-right-radius: $radiuspx;
-}
-
-.vevent .event-end {
-	padding-bottom: 10px;
-}
-
-#event-summary-text {
-	margin-top: 15px;
-}
-
-
-#new-event-link {
-	margin-bottom: 10px;
-}
-
-.edit-event-link, .plink-event-link, .drop-event-link {
-	float: left;
-	margin-top: 4px;
-	margin-right: 4px;
-	margin-bottom: 15px;
-}
-
-.event-owner img {
-	padding-bottom: 10px;
-	padding-right: 10px;
-}
-
-.event-buttons {
-	margin-top: 10px;
-}
-
-.event-list-date {
-	margin-bottom: 10px;
-}
-
-.prevcal, .nextcal {
-	float: left;
-	margin-left: 32px;
-	margin-right: 32px;
-	margin-top: 64px;
-}
-.event-calendar-end {
-	clear: both;
-}
-
-
-=======
->>>>>>> upstream/master
 #cboxOverlay {
 	z-index: 1050;
 }
@@ -2260,11 +2195,3 @@ nav .badge.mail-update:hover {
 .help-searchlist a {
 	font-size: 130%;
 }
-<<<<<<< HEAD
-
-.response-list ul {
-	list-style-type: none;
-}
-
-=======
->>>>>>> upstream/master