Mercurial > hg > soundsoftware-site
diff test/fixtures/.svn/text-base/time_entries.yml.svn-base @ 514:7eba09d624db live
Merge
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:50:53 +0100 |
parents | cbce1fd3b1b7 |
children |
line wrap: on
line diff
--- a/test/fixtures/.svn/text-base/time_entries.yml.svn-base Thu Jul 14 10:46:20 2011 +0100 +++ b/test/fixtures/.svn/text-base/time_entries.yml.svn-base Thu Jul 14 10:50:53 2011 +0100 @@ -55,4 +55,18 @@ hours: 7.65 user_id: 1 tyear: 2007 +time_entries_005: + created_on: 2011-03-22 12:20:48 +02:00 + tweek: 12 + tmonth: 3 + project_id: 5 + comments: Time spent on a subproject + updated_on: 2011-03-22 12:20:48 +02:00 + activity_id: 10 + spent_on: 2011-03-22 + issue_id: + id: 5 + hours: 7.65 + user_id: 1 + tyear: 2011