merged, conflict resolved

2011-09-25 06:56:48 +05:30 · 2011-09-25 06:56:48 +05:30 · dcc59293ba
commit dcc59293ba
parent cece1f3779
1 changed files with 2 additions and 0 deletions
--- a/itf/templates/modules/festival/participant.html
+++ b/itf/templates/modules/festival/participant.html
@ -1 +1,3 @@
+
 <div class="orange">{{ name }}:</div> {{ short_bio }}
+
				`@ -1 +1,3 @@`

				`<div class="orange">{{ name }}:</div> {{ short_bio }}`