Mercurial > hg > soundsoftware-site
annotate test/fixtures/comments.yml @ 1485:c8d3ad483bea redmine-2.4-integration
Fix stray merge markers
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Wed, 15 Jan 2014 13:34:12 +0000 |
| parents | 433d4f72a19b |
| children |
| rev | line source |
|---|---|
| Chris@0 | 1 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html |
| Chris@0 | 2 comments_001: |
| Chris@0 | 3 commented_type: News |
| Chris@0 | 4 commented_id: 1 |
| Chris@0 | 5 id: 1 |
| Chris@0 | 6 author_id: 1 |
| Chris@0 | 7 comments: my first comment |
| Chris@0 | 8 created_on: 2006-12-10 18:10:10 +01:00 |
| Chris@0 | 9 updated_on: 2006-12-10 18:10:10 +01:00 |
| Chris@0 | 10 comments_002: |
| Chris@0 | 11 commented_type: News |
| Chris@0 | 12 commented_id: 1 |
| Chris@0 | 13 id: 2 |
| Chris@0 | 14 author_id: 2 |
| Chris@0 | 15 comments: This is an other comment |
| Chris@0 | 16 created_on: 2006-12-10 18:12:10 +01:00 |
| Chris@0 | 17 updated_on: 2006-12-10 18:12:10 +01:00 |