Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-17 07:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove leftover from merge failure

Browse source
This commit is contained in:
Reinier Balt 2013-03-18 12:42:55 +01:00
parent 2596d612fa
commit ee43ccbee6
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/locales/en.yml
View file

@ -452,7 +452,6 @@ en:
show_from: Show from show_from: Show from
error_starring_recurring: "Could not toggle the star of recurring todo \'%{description}\'" 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 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 completed_recurring: Completed recurring todos
added_new_next_action: Added new next action added_new_next_action: Added new next action
completed_rest_of_previous_month: Completed in the rest of the previous month completed_rest_of_previous_month: Completed in the rest of the previous month