Index: indico/MaKaC/webinterface/tpls/ContributionReviewingHistory.tpl
===================================================================
--- indico/MaKaC/webinterface/tpls/ContributionReviewingHistory.tpl	(revision c818e699e31b416cd5ecf383eac52d6fa074bdf2)
+++ indico/MaKaC/webinterface/tpls/ContributionReviewingHistory.tpl	(revision 5b34124eb0b6706f9d9a031e984cf6b3834b57f4)
@@ -10,5 +10,9 @@
 		    <tr>
 <<<<<<< HEAD:indico/MaKaC/webinterface/tpls/ContributionReviewingHistory.tpl
+<<<<<<< HEAD:indico/MaKaC/webinterface/tpls/ContributionReviewingHistory.tpl
 		        <td colspan="3" class="groupTitle" style="width: 60%;padding-top:20px; border-bottom: none">
+=======
+		        <td colspan="3" class="groupTitle" style="padding-top:20px; border-bottom: none; font-size: 20px;">
+>>>>>>> 4608831... [FIXES] - task #108 + small layout fixes:indico/MaKaC/webinterface/tpls/ContributionReviewingHistory.tpl
 =======
 		        <td colspan="3" class="groupTitle" style="padding-top:20px; border-bottom: none; font-size: 20px;">
