arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-23 00:12:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge fail. DAVID!

Browse Source
This commit is contained in:
Tom Price
2015-05-26 17:57:43 +01:00
parent 1e61d760fa
commit bb0a5e4b1e
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RIGS/templates/RIGS/event_print_page.xml
View File

@@ -15,15 +15,9 @@
</para> </para>
<keepInFrame maxHeight="30"> <keepInFrame maxHeight="30">
<<<<<<< HEAD
<para style="style.event_description">
{{ object.description|default_if_none:""|linebreaksbr }}
</para>
=======
<para style="style.event_description"> <para style="style.event_description">
{{ object.description|default_if_none:""|linebreaksbr }} {{ object.description|default_if_none:""|linebreaksbr }}
</para> </para>
>>>>>>> revision-view
</keepInFrame> </keepInFrame>
{% if invoice %} {% if invoice %}