From ee43ccbee6da3856b775b3daab99dbadc71ad4a8 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Mon, 18 Mar 2013 12:42:55 +0100 Subject: [PATCH] remove leftover from merge failure --- config/locales/en.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index defa2eea..8b636a0c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -452,7 +452,6 @@ en: show_from: Show from error_starring_recurring: "Could not toggle the star of recurring todo \'%{description}\'" recurring_action_deleted: Action was deleted. Because this action is recurring, a new action was added ->>>>>>> do a big refactor of rendering collections of todos for home page, tag page, project page, context page completed_recurring: Completed recurring todos added_new_next_action: Added new next action completed_rest_of_previous_month: Completed in the rest of the previous month