From 80e097316540b13af550633a7bcb495468cb155a Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Thu, 13 Sep 2012 12:38:36 +0000
Subject: [PATCH] Cleanup after merge

---
 i2p2www/pages/meetings/show.html | 13 ++++++++++---
 show.html.other                  | 15 ---------------
 2 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 show.html.other

diff --git a/i2p2www/pages/meetings/show.html b/i2p2www/pages/meetings/show.html
index 0dcca0d3..034e7b69 100644
--- a/i2p2www/pages/meetings/show.html
+++ b/i2p2www/pages/meetings/show.html
@@ -1,8 +1,15 @@
 {% extends "global/layout.html" %}
-{% block title %}Meeting {{ id }}{% endblock %}
+{% block title %}I2P Development Meeting {{ id }}{% endblock %}
 {% block content %}
-{{ header }}
+{% autoescape false %}
+{% if header %}
+{{ header | restructuredtext }}
+{% endif %}
+{% endautoescape %}
+<div class="irclog">
 <pre>
-{{ log }}
+{{ log|escape }}
+{# TODO: pygments #}
 </pre>
+</div>
 {% endblock %}
diff --git a/show.html.other b/show.html.other
deleted file mode 100644
index 034e7b69..00000000
--- a/show.html.other
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}I2P Development Meeting {{ id }}{% endblock %}
-{% block content %}
-{% autoescape false %}
-{% if header %}
-{{ header | restructuredtext }}
-{% endif %}
-{% endautoescape %}
-<div class="irclog">
-<pre>
-{{ log|escape }}
-{# TODO: pygments #}
-</pre>
-</div>
-{% endblock %}