Mercurial > hg > soundsoftware-site
comparison test/fixtures/.svn/text-base/time_entries.yml.svn-base @ 524:1248a47e81b3 feature_36
Merge from branch "luisf"
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Mon, 25 Jul 2011 14:39:38 +0100 |
parents | cbce1fd3b1b7 |
children |
comparison
equal
deleted
inserted
replaced
519:3be6bc3c2a17 | 524:1248a47e81b3 |
---|---|
53 issue_id: | 53 issue_id: |
54 id: 4 | 54 id: 4 |
55 hours: 7.65 | 55 hours: 7.65 |
56 user_id: 1 | 56 user_id: 1 |
57 tyear: 2007 | 57 tyear: 2007 |
58 time_entries_005: | |
59 created_on: 2011-03-22 12:20:48 +02:00 | |
60 tweek: 12 | |
61 tmonth: 3 | |
62 project_id: 5 | |
63 comments: Time spent on a subproject | |
64 updated_on: 2011-03-22 12:20:48 +02:00 | |
65 activity_id: 10 | |
66 spent_on: 2011-03-22 | |
67 issue_id: | |
68 id: 5 | |
69 hours: 7.65 | |
70 user_id: 1 | |
71 tyear: 2011 | |
58 | 72 |