From dcc59293ba7d6bc2bbd9ab6768cf3bcbec6ec818 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Sun, 25 Sep 2011 06:56:48 +0530
Subject: [PATCH] merged, conflict resolved

---
 itf/templates/modules/festival/participant.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/itf/templates/modules/festival/participant.html b/itf/templates/modules/festival/participant.html
index 7f91fc7..b000e8d 100644
--- a/itf/templates/modules/festival/participant.html
+++ b/itf/templates/modules/festival/participant.html
@@ -1 +1,3 @@
+
 <div class="orange">{{ name }}:</div> {{ short_bio }}
+