From 5a28c5b273ecacf5a9923f6ecd23dba7de764a39 Mon Sep 17 00:00:00 2001 From: Thadeu Lima de Souza Cascardo Date: Fri, 7 Nov 2008 19:59:34 -0200 Subject: [PATCH 1/1] Fix bad merge --- eventos/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eventos/views.py b/eventos/views.py index e52fb1d..c155bf2 100644 --- a/eventos/views.py +++ b/eventos/views.py @@ -339,7 +339,7 @@ def talk_improve(request, tid): return HttpResponseRedirect('/improve/%d/' % talk.id) c = {'talk': talk, 'form': form, 'improve': improve, - 'len_comments': len(improve), 'speaker': speaker} + 'len_comments': len(improve), 'speakers': speakers} return render_to_response('eventos/talk-improve.html', Context(c), context_instance=RequestContext(request)) -- 2.20.1