From 2921746409572bdfae31fb0b86f298970cac9fd2 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Mon, 3 Jun 2013 15:21:19 +0200 Subject: [PATCH] fix manual merge error --- test/functional/todos_controller_test.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/functional/todos_controller_test.rb b/test/functional/todos_controller_test.rb index f3d3cdca..b784ea0b 100644 --- a/test/functional/todos_controller_test.rb +++ b/test/functional/todos_controller_test.rb @@ -955,4 +955,6 @@ class TodosControllerTest < ActionController::TestCase put :create, _source_view: params[:_source_view], context_name: params[:context_name], project_name: params[:project_name], tag_list: params[:tag_list], todo: {notes: params[:notes], description: params[:description], due: params[:due]} - end \ No newline at end of file + end + +end \ No newline at end of file