From bb0a5e4b1e6d6dc65882910c32e2833f3cea0055 Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Tue, 26 May 2015 17:57:43 +0100
Subject: [PATCH] Fix merge fail. DAVID!

---
 RIGS/templates/RIGS/event_print_page.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/RIGS/templates/RIGS/event_print_page.xml b/RIGS/templates/RIGS/event_print_page.xml
index 9187e317..1559818c 100644
--- a/RIGS/templates/RIGS/event_print_page.xml
+++ b/RIGS/templates/RIGS/event_print_page.xml
@@ -15,15 +15,9 @@
 </para>
 
 <keepInFrame maxHeight="30">
-<<<<<<< HEAD
-<para style="style.event_description">
-{{ object.description|default_if_none:""|linebreaksbr }}
-    </para>
-=======
     <para style="style.event_description">
     {{ object.description|default_if_none:""|linebreaksbr }}
         </para>
->>>>>>> revision-view
 </keepInFrame>
 
 {% if invoice %}