Mercurial > hg > soundsoftware-site
diff test/fixtures/.svn/text-base/wiki_contents.yml.svn-base @ 120:cd2282d2aa55 cannam
Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
author | Chris Cannam |
---|---|
date | Thu, 13 Jan 2011 14:33:08 +0000 |
parents | 8661b858af72 |
children |
line wrap: on
line diff
--- a/test/fixtures/.svn/text-base/wiki_contents.yml.svn-base Thu Jan 13 13:21:03 2011 +0000 +++ b/test/fixtures/.svn/text-base/wiki_contents.yml.svn-base Thu Jan 13 14:33:08 2011 +0000 @@ -95,4 +95,12 @@ version: 1 author_id: 1 comments: +wiki_contents_010: + text: Page with cyrillic title + updated_on: 2007-03-08 00:18:07 +01:00 + page_id: 10 + id: 10 + version: 1 + author_id: 1 + comments: \ No newline at end of file